From 0b7d8015251d5f5dc7cba584a8e2ca86a46f758a Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 22 Jan 2025 10:55:13 +0000 Subject: [PATCH] Fix Depends-On Use version checked out by Zuul so Depends-On works and only override version for previous release. Co-Authored-By: Will Szumski Change-Id: I539a29c77a0165d43ca2ce359105c5460f450cd8 --- roles/kayobe-galaxy-requirements/defaults/main.yml | 2 +- roles/kayobe-galaxy-requirements/tasks/main.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/roles/kayobe-galaxy-requirements/defaults/main.yml b/roles/kayobe-galaxy-requirements/defaults/main.yml index d39009ef8..dca4eae3c 100644 --- 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 index 0fcd197f1..7f48fb8a1 100644 --- 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([]) }}" +