[release] Set previous_release to xena
Also remove some Wallaby upgrade compatibility code in CI playbooks Change-Id: I84e336bec37eac12c659c7a9d9fc4ddd191a379d
This commit is contained in:
parent
7f72fdbe55
commit
4bf7cdf1e3
@ -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 }}"
|
||||
|
@ -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
|
||||
|
@ -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 }}"
|
||||
|
Loading…
Reference in New Issue
Block a user