From c74b7c21d5da65072dba3ccdaafca297189e28d9 Mon Sep 17 00:00:00 2001 From: Ronelle Landy Date: Tue, 5 Nov 2019 13:39:04 -0500 Subject: [PATCH] Match RHEL 8 images to containers used RHEL 8 should use the current-tripleo tagged image if pulling current-tripleo tagged containers - as CentOS does. Change-Id: Ib98d7b082115db8b6787ff502e09e9945fd0996b --- config/release/tripleo-ci/RedHat-8/master.yml | 4 ++-- config/release/tripleo-ci/RedHat-8/train.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/release/tripleo-ci/RedHat-8/master.yml b/config/release/tripleo-ci/RedHat-8/master.yml index e8624a7c7..58c2c959c 100644 --- a/config/release/tripleo-ci/RedHat-8/master.yml +++ b/config/release/tripleo-ci/RedHat-8/master.yml @@ -28,8 +28,8 @@ undercloud_docker_insecure_registries: "{{ docker_registry_host }}" docker_prep_prefix: rhel-binary docker_ceph_namespace: docker.io/ceph docker_openshift_tag: v3.11.0 -overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/tripleo-ci-testing/overcloud-full.tar" -ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar" +overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/current-tripleo/overcloud-full.tar" +ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/master/rdo_trunk/current-tripleo/ironic-python-agent.tar" repo_cmd_before: | sudo rm -rf /etc/yum.repos.d/delorean*; sudo rm -rf /etc/yum.repos.d/*.rpmsave; diff --git a/config/release/tripleo-ci/RedHat-8/train.yml b/config/release/tripleo-ci/RedHat-8/train.yml index 749fc8c99..701603117 100644 --- a/config/release/tripleo-ci/RedHat-8/train.yml +++ b/config/release/tripleo-ci/RedHat-8/train.yml @@ -28,8 +28,8 @@ undercloud_docker_insecure_registries: "{{ docker_registry_host }}" docker_prep_prefix: rhel-binary docker_ceph_namespace: docker.io/ceph docker_openshift_tag: v3.11.0 -overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/tripleo-ci-testing/overcloud-full.tar" -ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/tripleo-ci-testing/ironic-python-agent.tar" +overcloud_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/current-tripleo/overcloud-full.tar" +ipa_image_url: "http://38.145.34.141/rcm-guest/images/rhel8/{{ release }}/rdo_trunk/current-tripleo/ironic-python-agent.tar" repo_cmd_before: | sudo rm -rf /etc/yum.repos.d/delorean*; sudo rm -rf /etc/yum.repos.d/*.rpmsave;