From bac1e35e2d1b622d1c35b9caa0bdee98bbc66ab6 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 4 Mar 2020 16:24:54 +0200 Subject: [PATCH] Use centos8 built images Configure images' URLs for CentOS 8 OVB jobs Change-Id: I1a79d8f95109c2abd9e75dfcbed6342f4fc4397f --- toci-quickstart/config/testenv/ovb-rdocloud.yml | 8 ++++++-- toci-quickstart/config/testenv/ovb-vexxhost.yml | 8 ++++++-- toci-quickstart/config/testenv/ovb.yml | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml index 1239bac09..c3e1e5e52 100644 --- a/toci-quickstart/config/testenv/ovb-rdocloud.yml +++ b/toci-quickstart/config/testenv/ovb-rdocloud.yml @@ -15,14 +15,18 @@ workers_args: >- -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml -e {{ overcloud_templates_path }}/environments/debug.yaml overcloud_image_url: >- - {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar + {%- elif ansible_distribution_major_version|int >= 8-%} + https://images.rdoproject.org/centos8/{{ 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' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar + {%- elif ansible_distribution_major_version|int >= 8 -%} + https://images.rdoproject.org/centos8/{{ 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 %} diff --git a/toci-quickstart/config/testenv/ovb-vexxhost.yml b/toci-quickstart/config/testenv/ovb-vexxhost.yml index 7a108387a..1de3638e3 100644 --- a/toci-quickstart/config/testenv/ovb-vexxhost.yml +++ b/toci-quickstart/config/testenv/ovb-vexxhost.yml @@ -14,14 +14,18 @@ workers_args: >- -e {{ tripleo_root }}/tripleo-ci/test-environments/worker-config.yaml -e {{ overcloud_templates_path }}/environments/debug.yaml overcloud_image_url: >- - {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version >= '8' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar + {%- elif ansible_distribution_major_version|int >= 8-%} + https://images.rdoproject.org/centos8/{{ 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' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar + {%- elif ansible_distribution_major_version|int >= 8 -%} + https://images.rdoproject.org/centos8/{{ 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 %} diff --git a/toci-quickstart/config/testenv/ovb.yml b/toci-quickstart/config/testenv/ovb.yml index 9baa58947..2d81ca074 100644 --- a/toci-quickstart/config/testenv/ovb.yml +++ b/toci-quickstart/config/testenv/ovb.yml @@ -57,14 +57,18 @@ floating_ip_cidr: >- {%- endif %} 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' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar + {%- elif ansible_distribution_major_version|int >= 8-%} + https://images.rdoproject.org/centos8//{{ 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' -%} + {% if ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 -%} https://images.rdoproject.org:4433/rcm-guest/images/redhat8/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar + {%- elif ansible_distribution_major_version|int >= 8 -%} + https://images.rdoproject.org/centos8//{{ 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 %}