Merge "Remove conditional dlrn_hash_tag current-tripleo in mixed OS jobs"

This commit is contained in:
Zuul 2022-11-24 15:25:45 +00:00 committed by Gerrit Code Review
commit 2a10f0d115
2 changed files with 2 additions and 14 deletions

View File

@ -34,13 +34,7 @@ images:
type: tar
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
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 -%}
dlrn_hash_tag: tripleo-ci-testing
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

View File

@ -34,13 +34,7 @@ images:
type: tar
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
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 -%}
dlrn_hash_tag: tripleo-ci-testing
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