From 4bf7cdf1e35a0ac963e35ba28a4b1d28127d3c21 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 9 Nov 2021 17:31:06 +0000
Subject: [PATCH] [release] Set previous_release to xena
Also remove some Wallaby upgrade compatibility code in CI playbooks
Change-Id: I84e336bec37eac12c659c7a9d9fc4ddd191a379d
---
.../overrides.yml.j2 | 5 -----
playbooks/kayobe-overcloud-upgrade-base/run.yml | 15 +--------------
zuul.d/jobs.yaml | 2 +-
3 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
index 5b19dc729..85dc34453 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
+++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2
@@ -10,11 +10,6 @@ docker_registry_mirrors:
kolla_docker_namespace: "openstack.kolla"
# use the published images from a site mirror of quay.io
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
-# TODO(priteau): Remove this when previous_release is Xena
-{% if is_previous_release | default(false) and previous_release == 'wallaby'%}
-# Keep the existing image type when installing Wallaby.
-kolla_install_type: "{{ 'source' if ansible_distribution == 'Ubuntu' else 'binary' }}"
-{% endif %}
{% if not is_previous_release | default(false) %}
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index 5e93071aa..9316e18a2 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -17,9 +17,7 @@
# be run after install.
shell:
cmd: dev/configure-firewall.sh
- # TODO(mgoddard): Use the previous repo when the previous release
- # is no longer Wallaby.
- chdir: "{{ kayobe_src_dir }}"
+ chdir: "{{ previous_kayobe_src_dir }}"
executable: /bin/bash
- name: Ensure overcloud is deployed
@@ -107,17 +105,6 @@
cmd: "docker image prune --all --force"
become: true
- # TODO(mgoddard): Remove this task when the previous release is no
- # longer Wallaby.
- - name: Switch ironic nodes deploy interface to direct
- shell:
- cmd: >-
- source ~/tenks-venv/bin/activate &&
- source {{ kayobe_config_src_dir }}/etc/kolla/public-openrc.sh &&
- openstack baremetal node set tk0 --deploy-interface direct &&
- openstack baremetal node set tk1 --deploy-interface direct
- executable: /bin/bash
-
# Perform a smoke test against the upgraded current release.
- name: Perform testing of VMs in the upgraded overcloud
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 89d894a90..5e25cb02c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -73,7 +73,7 @@
- ^zuul.d/.*
vars:
# Name of the release to upgrade from for upgrade jobs.
- previous_release: wallaby
+ previous_release: xena
logs_dir: "/tmp/logs"
kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}"
kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe-config-dev'].src_dir }}"