From 38ca1431d765aacb5c03ee0fef16e28d5178c938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Tue, 15 Jun 2021 12:38:38 +0200
Subject: [PATCH] Update previous_release to Wallaby

Part of agreed Xena release process cadence:
R-17 Switch source images to current release

Change-Id: I221998092715355dd8b972bf2575d65c3259a4da
---
 ansible/group_vars/all.yml            |  2 +-
 ansible/roles/prechecks/vars/main.yml |  1 -
 tests/templates/globals-default.j2    |  5 +++++
 zuul.d/base.yaml                      |  2 +-
 zuul.d/jobs.yaml                      |  4 ++--
 zuul.d/nodesets.yaml                  | 12 ------------
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 9a5684433d..653e9b509f 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -524,7 +524,7 @@ openstack_logging_debug: "False"
 openstack_region_name: "RegionOne"
 
 # Variable defined the pin_release_version, apply for rolling upgrade process
-openstack_previous_release_name: "victoria"
+openstack_previous_release_name: "wallaby"
 
 # A list of policy file formats that are supported by Oslo.policy
 supported_policy_format_list:
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 16c60b8ba8..3597d69964 100644
--- a/ansible/roles/prechecks/vars/main.yml
+++ b/ansible/roles/prechecks/vars/main.yml
@@ -12,7 +12,6 @@ host_os_distributions:
   CentOS:
     - "8"
   Debian:
-    - "buster"
     - "bullseye"
   RHEL:
     - "8"
diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index d9f4298071..4044f3f385 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -33,6 +33,11 @@ enable_openstack_core: "{{ openstack_core_enabled }}"
 enable_horizon: "{{ dashboard_enabled }}"
 enable_heat: "{{ openstack_core_tested }}"
 
+{% if is_previous_release 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 }}"
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 4ea767e334..88ec224e3f 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -26,7 +26,7 @@
       - ^kolla_ansible/tests/
       - ^zuul\.d/
     vars:
-      previous_release: victoria
+      previous_release: wallaby
       scenario: core
       virt_type: qemu
       is_upgrade: no
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4e2c4e2cd2..a3fd05d672 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -134,7 +134,7 @@
 - job:
     name: kolla-ansible-debian-source-upgrade
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-debian-buster
+    nodeset: kolla-ansible-debian-bullseye
     timeout: 9000
     voting: false
     vars:
@@ -146,7 +146,7 @@
 - job:
     name: kolla-ansible-debian-source-upgrade-aarch64
     parent: kolla-ansible-debian-source-upgrade
-    nodeset: kolla-ansible-debian-buster-aarch64
+    nodeset: kolla-ansible-debian-bullseye-aarch64
 
 - job:
     name: kolla-ansible-ubuntu-source-upgrade
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 5b398e7209..6be81f98eb 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -11,18 +11,6 @@
       - name: primary
         label: centos-8-stream
 
-- nodeset:
-    name: kolla-ansible-debian-buster
-    nodes:
-      - name: primary
-        label: debian-buster
-
-- nodeset:
-    name: kolla-ansible-debian-buster-aarch64
-    nodes:
-      - name: primary
-        label: debian-buster-arm64
-
 - nodeset:
     name: kolla-ansible-debian-bullseye
     nodes: