diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index 033623c7e370a..200daf4da8de6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.22" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-22.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-22.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml index 32c31b4ccc95b..9c598bec2842c 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.16" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-16.ocp.svc > /etc/yum.repos.d/base-openstack-4-16.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml index 0bae00c76d1c8..0d75b2eaaf1d6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml @@ -20,7 +20,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -28,6 +28,12 @@ promotion: to: - name: "4.17" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-17.ocp.svc > /etc/yum.repos.d/base-openstack-4-17.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml index 608be2eb57005..946da6f9f14a6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.18" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-18.ocp.svc > /etc/yum.repos.d/base-openstack-4-18.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml index 833fea99a03fc..c09df2bc384cd 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.19" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-19.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-19.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml index d0416f26212ee..36cba334402b0 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.20" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-20.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-20.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml index 98c391b667f61..e95fff0a5a24b 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.21" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-21.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-21.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml index d40bd10e5193e..48bf046a9dee2 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.22.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -33,6 +33,12 @@ promotion: - disabled: true name: "4.22" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-22.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-22.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml index ca015fbb15441..0b71534cfbda6 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "4.23" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-4-23.ocp.svc > /etc/yum.repos.art/ci/base-openstack-4-23.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/ci-operator/config/openshift/origin/openshift-origin-release-5.0.yaml b/ci-operator/config/openshift/origin/openshift-origin-release-5.0.yaml index dd030f7a2f71c..415661bbbab52 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-release-5.0.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-release-5.0.yaml @@ -24,7 +24,7 @@ build_root: from_repository: true images: - dockerfile_path: images/tests/Dockerfile.rhel - from: tools + from: tools-openstack to: tests - dockerfile_path: images/hello-openshift/Dockerfile.rhel to: hello-openshift @@ -32,6 +32,12 @@ promotion: to: - name: "5.0" namespace: ocp +raw_steps: +- pipeline_image_cache_step: + commands: | + curl http://base-openstack-5-0.ocp.svc > /etc/yum.repos.art/ci/base-openstack-5-0.repo + from: tools + to: tools-openstack releases: initial: integration: diff --git a/core-services/release-controller/_repos/ocp-4.16-rhel9.repo b/core-services/release-controller/_repos/ocp-4.16-rhel9.repo index 88e861386f3f0..9dfbf5995db28 100644 --- a/core-services/release-controller/_repos/ocp-4.16-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.16-rhel9.repo @@ -255,15 +255,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.17-rhel9.repo b/core-services/release-controller/_repos/ocp-4.17-rhel9.repo index 9adae92dd067e..9b4c76421b561 100644 --- a/core-services/release-controller/_repos/ocp-4.17-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.17-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.18-rhel9.repo b/core-services/release-controller/_repos/ocp-4.18-rhel9.repo index c460529b8b641..8377242c719fa 100644 --- a/core-services/release-controller/_repos/ocp-4.18-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.18-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.19-rhel9.repo b/core-services/release-controller/_repos/ocp-4.19-rhel9.repo index ad1b9456ed31e..0d087fa9ee4e1 100644 --- a/core-services/release-controller/_repos/ocp-4.19-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.19-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.20-rhel9.repo b/core-services/release-controller/_repos/ocp-4.20-rhel9.repo index 4926d8b9d3ae2..e1a499f71b658 100644 --- a/core-services/release-controller/_repos/ocp-4.20-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.20-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.21-rhel9.repo b/core-services/release-controller/_repos/ocp-4.21-rhel9.repo index b851ab617f487..2fe733e692d81 100644 --- a/core-services/release-controller/_repos/ocp-4.21-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.21-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.22-rhel9.repo b/core-services/release-controller/_repos/ocp-4.22-rhel9.repo index 5537237d23618..a1260a94a52a1 100644 --- a/core-services/release-controller/_repos/ocp-4.22-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.22-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-4.23-rhel9.repo b/core-services/release-controller/_repos/ocp-4.23-rhel9.repo index b830aac09f2f5..048ce8c0b6ce7 100644 --- a/core-services/release-controller/_repos/ocp-4.23-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-4.23-rhel9.repo @@ -249,15 +249,3 @@ gpgcheck = 0 sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority - -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority diff --git a/core-services/release-controller/_repos/ocp-5.0-rhel9.repo b/core-services/release-controller/_repos/ocp-5.0-rhel9.repo index 12f6730a9dcdd..8628cef5c6624 100644 --- a/core-services/release-controller/_repos/ocp-5.0-rhel9.repo +++ b/core-services/release-controller/_repos/ocp-5.0-rhel9.repo @@ -250,15 +250,3 @@ sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -[rhel-9-openstack-17-rpms] -name = openstack-17-for-rhel-9-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel9/x86_64/openstack/17.1/os/ -enabled = 1 -gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-beta https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-openshifthosted -sslverify = false -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -