[release] Set previous_release to xena

Also remove some Wallaby upgrade compatibility code in CI playbooks

Change-Id: I84e336bec37eac12c659c7a9d9fc4ddd191a379d
This commit is contained in:
Mark Goddard 2021-11-09 17:31:06 +00:00
parent 7f72fdbe55
commit 4bf7cdf1e3
3 changed files with 2 additions and 20 deletions

View File

@ -10,11 +10,6 @@ docker_registry_mirrors:
kolla_docker_namespace: "openstack.kolla" kolla_docker_namespace: "openstack.kolla"
# use the published images from a site mirror of quay.io # use the published images from a site mirror of quay.io
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" 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) %} {% if not is_previous_release | default(false) %}
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"

View File

@ -17,9 +17,7 @@
# be run after install. # be run after install.
shell: shell:
cmd: dev/configure-firewall.sh cmd: dev/configure-firewall.sh
# TODO(mgoddard): Use the previous repo when the previous release chdir: "{{ previous_kayobe_src_dir }}"
# is no longer Wallaby.
chdir: "{{ kayobe_src_dir }}"
executable: /bin/bash executable: /bin/bash
- name: Ensure overcloud is deployed - name: Ensure overcloud is deployed
@ -107,17 +105,6 @@
cmd: "docker image prune --all --force" cmd: "docker image prune --all --force"
become: true 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. # Perform a smoke test against the upgraded current release.
- name: Perform testing of VMs in the upgraded overcloud - name: Perform testing of VMs in the upgraded overcloud

View File

@ -73,7 +73,7 @@
- ^zuul.d/.* - ^zuul.d/.*
vars: vars:
# Name of the release to upgrade from for upgrade jobs. # Name of the release to upgrade from for upgrade jobs.
previous_release: wallaby previous_release: xena
logs_dir: "/tmp/logs" logs_dir: "/tmp/logs"
kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}" 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 }}" kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe-config-dev'].src_dir }}"