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
This commit is contained in:
parent
856a51200f
commit
d7f71232be
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user