openstack/kayobe
Code Issues Proposed changes

Fix Depends-On

Browse Source 
Use version checked out by Zuul so Depends-On works and only override
version for previous release.

Co-Authored-By: Will Szumski <will@stackhpc.com>
Change-Id: I539a29c77a0165d43ca2ce359105c5460f450cd8
(cherry picked from commit 0b7d8015251d5f5dc7cba584a8e2ca86a46f758a)
This commit is contained in:
Matt Crees 2025-01-22 10:55:13 +00:00
parent 1bb0209cd5
commit 8d97bff81a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@
- name: Ensure previous kayobe repository is cloned
command: >-
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b unmaintained/{{ previous_release | lower }}
- name: Ensure previous kayobe-config directory exists
file:
@ -95,7 +95,7 @@
- name: Ensure kayobe-config repository is cloned
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 unmaintained/{{ previous_release | lower }}
- name: Ensure previous kolla-ansible directory exists
file:
@ -104,7 +104,7 @@
- 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 }}
git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b unmaintained/{{ previous_release | lower }}
- name: Ensure previous kayobe is executed in verbose mode
lineinfile:
@ -117,14 +117,14 @@
name: kayobe-galaxy-requirements
vars:
kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
kayobe_galaxy_requirements_branch: "unmaintained/{{ previous_release | lower }}"
- name: Update kolla-ansible requirements.yml
include_role:
name: kayobe-galaxy-requirements
vars:
kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
kayobe_galaxy_requirements_branch: "unmaintained/{{ previous_release | lower }}"
kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
when: is_upgrade

2
roles/kayobe-galaxy-requirements/defaults/main.yml
View File

@ -1,5 +1,5 @@
---
kayobe_galaxy_requirements_src_dir:
kayobe_galaxy_requirements_branch: "{{ zuul.branch }}"
kayobe_galaxy_requirements_branch:
kayobe_galaxy_requirements_src_path: "requirements.yml"
kayobe_galaxy_requirements_dest_path: "{{ kayobe_galaxy_requirements_src_dir }}/{{ kayobe_galaxy_requirements_src_path }}"

7
roles/kayobe-galaxy-requirements/tasks/main.yml
View File

@ -14,7 +14,12 @@
new_requirement:
name: "file://{{ ansible_collection_kolla_src_dir }}"
type: git
override_version:
version: "{{ kayobe_galaxy_requirements_branch }}"
# NOTE(wszusmki): Use version checked out by Zuul so Depends-On works and only override version
# for previous release.
new_requirement_with_version: "{{ new_requirement | combine(override_version) if kayobe_galaxy_requirements_branch else new_requirement }}"
new_requirements:
collections: "{{ (old_requirements.collections | rejectattr('name', 'search', 'ansible-collection-kolla') | list) + [new_requirement] }}"
collections: "{{ (old_requirements.collections | rejectattr('name', 'search', 'ansible-collection-kolla') | list) + [new_requirement_with_version] }}"
roles: "{{ old_requirements.roles | default([]) }}"