Remove rhel-9-openstack-17-rpms from base rhel9 repo files

ci-operator/config/openshift/origin/openshift-origin-main.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.16.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.17.yaml

@@ -20,14 +20,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.18.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.19.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.20.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-4.21.yaml

@@ -24,14 +24,20 @@ 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
 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:

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:

ci-operator/config/openshift/origin/openshift-origin-release-4.23.yaml

@@ -24,14 +24,20 @@ 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
 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:

ci-operator/config/openshift/origin/openshift-origin-release-5.0.yaml

@@ -24,14 +24,20 @@ 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
 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:

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

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

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

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

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

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

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

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

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
-