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
This commit is contained in:
Matt Crees 2025-01-22 10:55:13 +00:00
parent 1424835969
commit 0b7d801525
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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([]) }}"