openstack/kayobe
Code Issues Proposed changes

CI: Set previous_release to Yoga

Browse Source 
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/859828

Change-Id: I295e8f5f1cc9b7af1cd45ac788db473510220170
This commit is contained in:
Michal Nasiadka 2022-09-29 09:43:53 +02:00
parent 608951fcce
commit 05a2c1acbd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
playbooks/kayobe-base/pre.yml
View File

@ -91,6 +91,15 @@
command: >- command: >-
git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }} git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
- name: Ensure previous kolla-ansible directory exists
file:
path: "{{ previous_kolla_ansible_src_dir }}"
state: directory
- name: Ensure previous kolla-ansible repository is cloned
command: >-
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
- name: Ensure previous kayobe is executed in verbose mode - name: Ensure previous kayobe is executed in verbose mode
lineinfile: lineinfile:
path: "{{ previous_kayobe_src_dir }}/dev/config.sh" path: "{{ previous_kayobe_src_dir }}/dev/config.sh"
@ -103,8 +112,7 @@
vars: vars:
kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}" kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
# TODO(mgoddard): Always do this when previous release is Yoga. when: previous_release == 'yoga'
when: previous_release != 'xena'
- name: Update kolla-ansible requirements.yml - name: Update kolla-ansible requirements.yml
include_role: include_role:
@ -113,7 +121,6 @@
kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}" kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml" kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
# TODO(mgoddard): Always do this when previous release is Yoga. when: previous_release == 'yoga'
when: previous_release != 'xena'
when: is_upgrade when: is_upgrade

3
zuul.d/jobs.yaml
View File

@ -88,7 +88,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: xena previous_release: yoga
logs_dir: "/tmp/logs" logs_dir: "/tmp/logs"
ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}" ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}"
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 }}"
@ -96,6 +96,7 @@
kolla_ansible_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}" kolla_ansible_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}" previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}" previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
previous_kolla_ansible_src_dir: "{{ ansible_env.PWD ~ '/previous/kolla-ansible' }}"
requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}" requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}" tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
is_upgrade: "{{ 'upgrade' in zuul.job }}" is_upgrade: "{{ 'upgrade' in zuul.job }}"