From 961eacd54d1489afef26c2b5f8e00090b24e03f5 Mon Sep 17 00:00:00 2001 From: Luke Meyer Date: Fri, 13 May 2022 09:33:15 -0400 Subject: [PATCH] ocp-4.11 repos: align after 8.6 GA with RHEL 8.6 GA we can now pin to it for the base OS and codeready, and get rid of beta repos; this aligns with ART config. NFV and virt aren't configured by ART, so these were left pinned to 8.4 in ocp-4.11-rhel8.repo as they have been, and this was copied to ocp-4.11-rhel86.repo so they are now identical. --- .../_repos/ocp-4.11-rhel8-aarch64.repo | 30 ++----------------- .../_repos/ocp-4.11-rhel8.repo | 30 ++----------------- .../_repos/ocp-4.11-rhel86.repo | 10 +++---- 3 files changed, 11 insertions(+), 59 deletions(-) diff --git a/core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo b/core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo index 3f8fcff4f2129..7a12e4dba9a05 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel8-aarch64.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/dist/rhel8/8/aarch64/baseos/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/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,31 +12,7 @@ failovermethod = priority [rhel-8-appstream] name = rhel-8-appstream -baseurl = https://cdn.redhat.com/content/dist/rhel8/8/aarch64/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 -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority - -[rhel-8.6-baseos] -name = rhel-8.6-baseos -baseurl = https://cdn.redhat.com/content/beta/rhel8/8/aarch64/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 -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority - -[rhel-8.6-appstream] -name = rhel-8.6-appstream -baseurl = https://cdn.redhat.com/content/beta/rhel8/8/aarch64/appstream/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/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 @@ -93,7 +69,7 @@ failovermethod = priority [rhel-8-codeready-builder-rpms] name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/codeready-builder/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/aarch64/codeready-builder/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 diff --git a/core-services/release-controller/_repos/ocp-4.11-rhel8.repo b/core-services/release-controller/_repos/ocp-4.11-rhel8.repo index 4d272a3328720..fb5a0477097fa 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel8.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel8.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/dist/rhel8/8/x86_64/baseos/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/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,31 +12,7 @@ failovermethod = priority [rhel-8-appstream] name = rhel-8-appstream -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 -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority - -[rhel-8.6-baseos] -name = rhel-8.6-baseos -baseurl = https://cdn.redhat.com/content/beta/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 -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority - -[rhel-8.6-appstream] -name = rhel-8.6-appstream -baseurl = https://cdn.redhat.com/content/beta/rhel8/8/x86_64/appstream/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/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 @@ -113,7 +89,7 @@ failovermethod = priority [rhel-8-codeready-builder-rpms] name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/codeready-builder/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/codeready-builder/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 diff --git a/core-services/release-controller/_repos/ocp-4.11-rhel86.repo b/core-services/release-controller/_repos/ocp-4.11-rhel86.repo index 8650e56a52463..fb5a0477097fa 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel86.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel86.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/dist/rhel8/8/x86_64/baseos/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/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/x86_64/appstream/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/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 @@ -45,7 +45,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/x86_64/nfv/os/ +baseurl = https://cdn.redhat.com/content/tus/rhel8/8.4/x86_64/nfv/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem @@ -55,7 +55,7 @@ gpgkey = https://mirror.ops.rhcloud.com/libra/keys/RPM-GPG-KEY-redhat-release ht [rhel-8-advanced-virt] name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/advanced-virt/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/x86_64/advanced-virt/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem @@ -89,7 +89,7 @@ failovermethod = priority [rhel-8-codeready-builder-rpms] name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/beta/rhel8/8/x86_64/codeready-builder/os/ +baseurl = https://cdn.redhat.com/content/eus/rhel8/8.6/x86_64/codeready-builder/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