From d7f71232be7b0febe0eb40893fa0f87e34dcca3a Mon Sep 17 00:00:00 2001 From: Marios Andreou Date: Fri, 19 Aug 2022 15:46:41 +0300 Subject: [PATCH] Tweak conditional mixed-os dlrn_hash_tag ci-testing/current-tripleo For the periodic lines, depending if the job is running in the 8 or 9 line we must fetch current-tripleo of the 'not under test' content. Also see related patch at [1] that depends-on this. [1] https://review.rdoproject.org/r/c/rdo-jobs/+/44591 Change-Id: I43efaea7c0d9e1506819dcfb105fa3400163f8a3 --- .../CentOS-8/promotion-testing-hash-wallaby.yml | 5 +++-- .../CentOS-9/promotion-testing-hash-wallaby.yml | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml index e4916854c..83e35073d 100644 --- a/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml +++ b/config/release/tripleo-ci/CentOS-8/promotion-testing-hash-wallaby.yml @@ -35,12 +35,13 @@ images: dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }} dlrn_hash_tag: >- - {% if registry_distro is defined and - registry_distro | default('') | length > 0 -%} + {% if job.mixed_os_stable_version is defined and + job.mixed_os_stable_version in distro_ver -%} current-tripleo {%- else -%} tripleo-ci-testing {%- endif -%} + overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/{{ overcloud_image }}.{{ overcloud_image_type }}" ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml index d736390e5..3cb93fb6b 100644 --- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml +++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml @@ -34,7 +34,13 @@ images: type: tar dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }} -dlrn_hash_tag: tripleo-ci-testing +dlrn_hash_tag: >- + {% if job.mixed_os_stable_version is defined and + job.mixed_os_stable_version in distro_ver -%} + current-tripleo + {%- else -%} + tripleo-ci-testing + {%- endif -%} overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/{{ overcloud_image }}.{{ overcloud_image_type }}" ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar