From 67caf012ae9784f7652fa8d742252a0615b351d6 Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Tue, 15 Feb 2022 19:34:13 -0500 Subject: [PATCH] release-controller: update RHEL repo locations The previous location that was chosen to create these repo definitions only included the RHEL 8.5 GA content and was missing all the z-stream updates that have shipped since then. (Confusingly, those updates onlyt land in `dist/rhel8/8` and `dist/rhel8/8.5` remains static) This also updates the location of the RHEL AV repo to point to content shipped alongside RHEL 8.5. --- .../release-controller/_repos/ocp-4.11-rhel85.repo | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core-services/release-controller/_repos/ocp-4.11-rhel85.repo b/core-services/release-controller/_repos/ocp-4.11-rhel85.repo index 09bf44094c53d..1ee9db12f4e98 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel85.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel85.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/dist/rhel8/8.5/x86_64/baseos/os/ +baseurl = https://cdn.redhat.com/content/dist/rhel8/8/x86_64/baseos/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 @@ -12,7 +12,7 @@ failovermethod = priority [rhel-8-appstream] name = rhel-8-appstream -baseurl = https://cdn.redhat.com/content/dist/rhel8/8.5/x86_64/appstream/os/ +baseurl = https://cdn.redhat.com/content/dist/rhel8/8/x86_64/appstream/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 @@ -59,7 +59,7 @@ gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release ht [rhel-8-nfv] name = rhel-8-nfv -baseurl = https://cdn.redhat.com/content/dist/rhel8/8.5/x86_64/nfv/os/ +baseurl = https://cdn.redhat.com/content/dist/rhel8/8/x86_64/nfv/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem @@ -69,8 +69,7 @@ gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release ht [rhel-8-advanced-virt] name = rhel-8-advanced-virt -# FIXME - this is only in EUS? -baseurl = https://cdn.redhat.com/content/dist/rhel8/8.4/x86_64/advanced-virt/os/ +baseurl = https://cdn.redhat.com/dist/layered/rhel8/x86_64/advanced-virt/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem