From feb70547c1e763124161bd4fe08f88749d76dbae Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 9 Nov 2021 17:36:55 +0000
Subject: [PATCH] [release] Set previous_release to xena

This defines which release we upgrade from in CI.

Also remove some Wallaby upgrade compatibility code in CI playbooks

Change-Id: I18912178392973337ca4115dec3816f1b3944ad5
---
 ansible/group_vars/all.yml         |  2 +-
 tests/templates/ansible.cfg.j2     |  4 ----
 tests/templates/globals-default.j2 | 12 +-----------
 tests/templates/inventory.j2       |  7 -------
 zuul.d/base.yaml                   |  2 +-
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index a1b2cfbdcd..b5aa7ca7f3 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -539,7 +539,7 @@ openstack_logging_debug: "False"
 openstack_region_name: "RegionOne"
 
 # Variable defined the pin_release_version, apply for rolling upgrade process
-openstack_previous_release_name: "wallaby"
+openstack_previous_release_name: "xena"
 
 # A list of policy file formats that are supported by Oslo.policy
 supported_policy_format_list:
diff --git a/tests/templates/ansible.cfg.j2 b/tests/templates/ansible.cfg.j2
index 54f74ca5bf..d652f6aebf 100644
--- a/tests/templates/ansible.cfg.j2
+++ b/tests/templates/ansible.cfg.j2
@@ -1,12 +1,8 @@
 [defaults]
 callback_plugins = {{ ara_callback_plugins.stdout }}
 host_key_checking = False
-# TODO(mgoddard): Add inject_facts_as_vars unconditionally when previous
-# release is xena or previous release has had this patch backported.
-{% if not is_upgrade or previous_release not in ["victoria", "wallaby"] %}
 # Ensure that facts are referenced via ansible_facts.<fact>.
 inject_facts_as_vars = False
-{% endif %}
 
 [ssh_connection]
 pipelining = True
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 72d74067fa..5619b7817f 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -33,12 +33,6 @@ enable_openstack_core: "{{ openstack_core_enabled }}"
 enable_horizon: "{{ dashboard_enabled }}"
 enable_heat: "{{ openstack_core_tested }}"
 
-# TODO(mgoddard): Remove when previous release is Xena.
-{% if is_previous_release and previous_release == "wallaby" and scenario != "cephadm" %}
-# NOTE(mnasiadka): Test chrony cleanup in upgrade jobs
-enable_chrony: "yes"
-{% endif %}
-
 {% if scenario != 'bifrost' %}
 kolla_internal_vip_address: "{{ kolla_internal_vip_address }}"
 neutron_external_interface: "{{ neutron_external_interface_name }}"
@@ -130,7 +124,7 @@ glance_backend_ceph: "yes"
 cinder_backend_ceph: "yes"
 nova_backend_ceph: "yes"
 
-enable_ceph_rgw: {{ not is_upgrade or previous_release != 'wallaby' }}
+enable_ceph_rgw: "yes"
 ceph_rgw_hosts:
 {% for host in hostvars %}
   - host: {{ host }}
@@ -151,12 +145,8 @@ openstack_cacert: "/etc/ssl/certs/ca-certificates.crt"
 openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt"
 {% endif %}
 kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt"
-# TODO(mgoddard): Remove the condition when Victoria supports RabbitMQ TLS,
-# or the previous release is no longer Victoria.
-{% if not is_upgrade or previous_release != "victoria" %}
 rabbitmq_enable_tls: "yes"
 {% endif %}
-{% endif %}
 
 {% if scenario == 'linuxbridge' %}
 neutron_plugin_agent: "linuxbridge"
diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2
index bef80fbb80..31563840dd 100644
--- a/tests/templates/inventory.j2
+++ b/tests/templates/inventory.j2
@@ -147,13 +147,6 @@ compute
 
 [loadbalancer:children]
 network
-{% if is_previous_release and previous_release == "wallaby" %}
-[keepalived:children]
-loadbalancer
-
-[haproxy:children]
-loadbalancer
-{% endif %}
 
 [mariadb:children]
 control
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 16ee546491..e3291a435f 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -26,7 +26,7 @@
       - ^kolla_ansible/tests/
       - ^zuul\.d/
     vars:
-      previous_release: wallaby
+      previous_release: xena
       scenario: core
       virt_type: qemu
       is_upgrade: no