diff --git a/clusters/build-clusters/common/release-controller/rpms-ocp-4.12.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.12.yaml index e1859d66c41d1..6222ad973bfb7 100644 --- a/clusters/build-clusters/common/release-controller/rpms-ocp-4.12.yaml +++ b/clusters/build-clusters/common/release-controller/rpms-ocp-4.12.yaml @@ -768,101 +768,6 @@ spec: # art_rpm_mirroring_services.py added the following resource #--------------------------------------------------------------------------------- -apiVersion: v1 -kind: Service -metadata: - name: base-4-12-rhel85 - namespace: ocp -spec: - ports: - - port: 80 - targetPort: 8080 - selector: - app: base-4-12-rhel85 - type: ClusterIP ---- -#--------------------------------------------------------------------------------- -# art_rpm_mirroring_services.py added the following resource -#--------------------------------------------------------------------------------- - -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]' - labels: - app: base-4-12-rhel85 - name: base-4-12-rhel85 - namespace: ocp -spec: - replicas: 2 - selector: - matchLabels: - app: base-4-12-rhel85 - template: - metadata: - annotations: - cluster-autoscaler.kubernetes.io/safe-to-evict: 'true' - labels: - app: base-4-12-rhel85 - spec: - containers: - - command: - - content-mirror - - --path=/tmp/config - - --max-size=5g - - --timeout=30m - - /tmp/repos - image: ' ' - livenessProbe: - httpGet: - path: /rhel-8-baseos/repodata/repomd.xml - port: 8080 - initialDelaySeconds: 120 - periodSeconds: 120 - name: mirror - ports: - - containerPort: 8080 - name: http - resources: - requests: - memory: 500Mi - volumeMounts: - - mountPath: /tmp/repos - name: repos - readOnly: true - - mountPath: /tmp/key - name: key - readOnly: true - - mountPath: /tmp/mirror-enterprise-basic-auth - name: mirror-enterprise-basic-auth - readOnly: true - - mountPath: /tmp/cache - name: cache - workingDir: /tmp/repos - volumes: - - configMap: - items: - - key: ocp-4.12-rhel85.repo - path: ocp-4.12-rhel85.repo - name: base-repos - name: repos - - name: key - secret: - secretName: mirror.openshift.com - - name: mirror-enterprise-basic-auth - secret: - defaultMode: 420 - secretName: mirror-enterprise-basic-auth - - emptyDir: {} - name: cache - - emptyDir: {} - name: run ---- -#--------------------------------------------------------------------------------- -# art_rpm_mirroring_services.py added the following resource -#--------------------------------------------------------------------------------- - apiVersion: v1 kind: Service metadata: 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 7a12e4dba9a05..d977e0596da42 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 @@ -45,16 +45,6 @@ failovermethod = priority gpgcheck = 0 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 -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/advanced-virt/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - [rhel-8-ansible-2.9] name = rhel-8-ansible-2.9 baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/aarch64/ansible/2.9/os/ 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 fb5a0477097fa..0acdcfac0c88b 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel8.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel8.repo @@ -22,17 +22,6 @@ sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -[rhel-8-server-ose] -name = rhel-8-server-ose -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.11/rhel-8-server-ose-rpms -sslverify = false -username_file=/tmp/mirror-enterprise-basic-auth/username -password_file=/tmp/mirror-enterprise-basic-auth/password -failovermethod = priority -skip_if_unavailable = true -gpgcheck = 0 -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 - [rhel-8-fast-datapath] name = rhel-8-fast-datapath baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/fast-datapath/os/ @@ -43,26 +32,6 @@ failovermethod = priority gpgcheck = 0 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 -[rhel-8-nfv] -name = rhel-8-nfv -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 -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -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 -failovermethod = priority -gpgcheck = 0 -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 - [rhel-8-ansible-2.9] name = rhel-8-ansible-2.9 baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/ 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 8942f93e8b6b0..1b28a512182dd 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel85.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel85.repo @@ -52,49 +52,3 @@ sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority gpgcheck = 0 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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/advanced-virt/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-ansible-2.9] -name = rhel-8-ansible-2.9 -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/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 - -[openstack-16-for-rhel-8-rpms] -name = openstack-16-for-rhel-8-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/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-codeready-builder-rpms] -name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/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 -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.11-rhel86.repo b/core-services/release-controller/_repos/ocp-4.11-rhel86.repo index fb5a0477097fa..5e77c3fce4671 100644 --- a/core-services/release-controller/_repos/ocp-4.11-rhel86.repo +++ b/core-services/release-controller/_repos/ocp-4.11-rhel86.repo @@ -45,56 +45,10 @@ 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/tus/rhel8/8.4/x86_64/nfv/os/ +baseurl = https://cdn.redhat.com/content/tus/rhel8/8.6/x86_64/nfv/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority gpgcheck = 0 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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -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 -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-ansible-2.9] -name = rhel-8-ansible-2.9 -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/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 - -[openstack-16-for-rhel-8-rpms] -name = openstack-16-for-rhel-8-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/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-codeready-builder-rpms] -name = rhel-8-codeready-builder-rpms -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 -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.12-rhel8-aarch64.repo b/core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo index e74127708f17b..f37a7668bd636 100644 --- a/core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo +++ b/core-services/release-controller/_repos/ocp-4.12-rhel8-aarch64.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/beta/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,7 +12,7 @@ failovermethod = priority [rhel-8-appstream] name = rhel-8-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 @@ -45,16 +45,6 @@ failovermethod = priority gpgcheck = 0 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 -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/aarch64/advanced-virt/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - [rhel-8-ansible-2.9] name = rhel-8-ansible-2.9 baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/aarch64/ansible/2.9/os/ @@ -69,7 +59,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.12-rhel8.repo b/core-services/release-controller/_repos/ocp-4.12-rhel8.repo index 265dacfe4892f..0acdcfac0c88b 100644 --- a/core-services/release-controller/_repos/ocp-4.12-rhel8.repo +++ b/core-services/release-controller/_repos/ocp-4.12-rhel8.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/beta/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/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 @@ -22,17 +22,6 @@ sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority -[rhel-8-server-ose] -name = rhel-8-server-ose -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.12/rhel-8-server-ose-rpms -sslverify = false -username_file=/tmp/mirror-enterprise-basic-auth/username -password_file=/tmp/mirror-enterprise-basic-auth/password -failovermethod = priority -skip_if_unavailable = true -gpgcheck = 0 -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 - [rhel-8-fast-datapath] name = rhel-8-fast-datapath baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/fast-datapath/os/ @@ -43,26 +32,6 @@ failovermethod = priority gpgcheck = 0 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 -[rhel-8-nfv] -name = rhel-8-nfv -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 -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -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 -failovermethod = priority -gpgcheck = 0 -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 - [rhel-8-ansible-2.9] name = rhel-8-ansible-2.9 baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/os/ @@ -89,7 +58,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.12-rhel85.repo b/core-services/release-controller/_repos/ocp-4.12-rhel85.repo deleted file mode 100644 index fa2f8415c0c71..0000000000000 --- a/core-services/release-controller/_repos/ocp-4.12-rhel85.repo +++ /dev/null @@ -1,100 +0,0 @@ -[rhel-8-baseos] -name = rhel-8-baseos -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 -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-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-server-ose] -name = rhel-8-server-ose -baseurl = https://mirror2.openshift.com/enterprise/reposync/4.12/rhel-8-server-ose-rpms -sslverify = false -username_file=/tmp/mirror-enterprise-basic-auth/username -password_file=/tmp/mirror-enterprise-basic-auth/password -failovermethod = priority -skip_if_unavailable = true -gpgcheck = 0 -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 - -[rhel-8-fast-datapath] -name = rhel-8-fast-datapath -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/fast-datapath/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-nfv] -name = rhel-8-nfv -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 -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/advanced-virt/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-ansible-2.9] -name = rhel-8-ansible-2.9 -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/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 - -[openstack-16-for-rhel-8-rpms] -name = openstack-16-for-rhel-8-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/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-codeready-builder-rpms] -name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/eus/rhel8/8.4/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 -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.12-rhel86.repo b/core-services/release-controller/_repos/ocp-4.12-rhel86.repo index 6372b6dbbe880..69854357b7e01 100644 --- a/core-services/release-controller/_repos/ocp-4.12-rhel86.repo +++ b/core-services/release-controller/_repos/ocp-4.12-rhel86.repo @@ -1,6 +1,6 @@ [rhel-8-baseos] name = rhel-8-baseos -baseurl = https://cdn.redhat.com/content/beta/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/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 @@ -45,56 +45,10 @@ 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/beta/rhel8/8/x86_64/nfv/os/ +baseurl = https://cdn.redhat.com/content/tus/rhel8/8.6/x86_64/nfv/os/ sslverify = false sslclientkey = /tmp/key/rh-cdn.pem sslclientcert = /tmp/key/rh-cdn.pem failovermethod = priority gpgcheck = 0 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 - -[rhel-8-advanced-virt] -name = rhel-8-advanced-virt -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/advanced-virt/os/ -sslverify = false -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority -gpgcheck = 0 -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 - -[rhel-8-ansible-2.9] -name = rhel-8-ansible-2.9 -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/ansible/2.9/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 - -[openstack-16-for-rhel-8-rpms] -name = openstack-16-for-rhel-8-rpms -baseurl = https://cdn.redhat.com/content/dist/layered/rhel8/x86_64/openstack/16.2/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-codeready-builder-rpms] -name = rhel-8-codeready-builder-rpms -baseurl = https://cdn.redhat.com/content/beta/rhel8/8/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 -gpgcheck = 0 -# https://projects.engineering.redhat.com/browse/RCM-65421 -sslclientkey = /tmp/key/rh-cdn.pem -sslclientcert = /tmp/key/rh-cdn.pem -failovermethod = priority