Merge pull request #384 from stackhpc/upstream/2023.1-2025-02-10

Synchronise 2023.1 with upstream
stackhpc · Feb 10, 2025 · 1b63ae5 · 1b63ae5
2 parents 7b2d17a + 3a82e88
commit 1b63ae5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/roles/kayobe-galaxy-requirements/defaults/main.yml b/roles/kayobe-galaxy-requirements/defaults/main.yml
@@ -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 }}"
diff --git a/roles/kayobe-galaxy-requirements/tasks/main.yml b/roles/kayobe-galaxy-requirements/tasks/main.yml
@@ -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([]) }}"
+