Merge "Remove conditional dlrn_hash_tag current-tripleo in mixed OS jobs"
This commit is contained in:
commit
2a10f0d115
|
@ -34,13 +34,7 @@ images:
|
||||||
type: tar
|
type: tar
|
||||||
|
|
||||||
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
|
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
|
||||||
dlrn_hash_tag: >-
|
dlrn_hash_tag: tripleo-ci-testing
|
||||||
{% 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 }}"
|
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
|
ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar
|
||||||
|
|
|
@ -34,13 +34,7 @@ images:
|
||||||
type: tar
|
type: tar
|
||||||
|
|
||||||
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
|
dlrn_baseurl: https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}
|
||||||
dlrn_hash_tag: >-
|
dlrn_hash_tag: tripleo-ci-testing
|
||||||
{% 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 }}"
|
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
|
ipa_image_url: https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue