openstack/tripleo-ci
Code Issues Proposed changes

Use release and dlrn_hash/tag var instead of hardcoded value

Browse Source 
in ovb and ovb-rdocloud.yaml, for RHEL-8 overcloud_image_url and
ipa_image_url, release and dlrn_hash/tag was hardcoded to master
and due to this master image gets pulled in train job also leading
to unwanted to RHEL8 fs01 train job.

Closes-Bug: #1853978

Change-Id: I737c6c272448eca14683b845563102afd0fc0f96
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
This commit is contained in:
Chandan Kumar (raukadah)
2019-12-05 14:41:59 +05:30
parent 7679b71817
commit 170783ec5c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
toci-quickstart/config/testenv/ovb-rdocloud.yml
View File

@@ -16,13 +16,13 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/debug.yaml
overcloud_image_url: >-
{% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%}
http://38.145.34.141/rcm-guest/images/redhat8/master/rdo_trunk/tripleo-ci-testing/overcloud-full.tar
http://38.145.34.141/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
{%- else -%}
http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
{%- endif %}
ipa_image_url: >-
{% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%}
http://38.145.34.141/rcm-guest/images/redhat8/master/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar
http://38.145.34.141/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
{%- else -%}
http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
{%- endif %}

4
toci-quickstart/config/testenv/ovb.yml
View File

@@ -58,13 +58,13 @@ floating_ip_cidr: >-
tempest_test_image_path: /opt/cache/files/cirros-0.3.5-x86_64-disk.img
overcloud_image_url: >-
{% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%}
http://38.145.34.141/rcm-guest/images/redhat8/master/rdo_trunk/tripleo-ci-testing/overcloud-full.tar
http://38.145.34.141/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
{%- else -%}
http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
{%- endif %}
ipa_image_url: >-
{% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%}
http://38.145.34.141/rcm-guest/images/redhat8/master/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar
http://38.145.34.141/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
{%- else -%}
http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
{%- endif %}