repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS (openshift#51750)

* repos: 4.16: Use RHEL 9.4 EUS repos for RHCOS * repos: 4.16: Remove now unused RHEL 9.2 repos
jlebon · May 7, 2024 · a2f8467 · a2f8467
1 parent e0c4dc3
commit a2f8467
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 172 deletions.
diff --git a/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.16.yaml
@@ -1184,104 +1184,6 @@ spec:
 # art_rpm_mirroring_services.py added the following resource
 #---------------------------------------------------------------------------------
 
-apiVersion: v1
-kind: Service
-metadata:
-  name: base-4-16-rhel92
-  namespace: ocp
-spec:
-  ports:
-  - port: 80
-    targetPort: 8080
-  selector:
-    app: base-4-16-rhel92
-  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-16-rhel92
-  name: base-4-16-rhel92
-  namespace: ocp
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: base-4-16-rhel92
-  template:
-    metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
-      labels:
-        app: base-4-16-rhel92
-    spec:
-      containers:
-      - command:
-        - content-mirror
-        - --path=/tmp/config
-        - --max-size=5g
-        - --timeout=30m
-        - /tmp/repos
-        image: ' '
-        livenessProbe:
-          httpGet:
-            path: /rhel-9.2-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
-      nodeSelector:
-        kubernetes.io/arch: amd64
-        kubernetes.io/os: linux
-      volumes:
-      - configMap:
-          items:
-          - key: ocp-4.16-rhel92.repo
-            path: ocp-4.16-rhel92.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.16-rhel92.repo b/core-services/release-controller/_repos/ocp-4.16-rhel92.repo
diff --git a/core-services/release-controller/_repos/ocp-4.16-rhel94.repo b/core-services/release-controller/_repos/ocp-4.16-rhel94.repo
@@ -1,6 +1,6 @@
 [rhel-9.4-baseos]
 name = rhel-9.4-baseos
-baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/baseos/os
+baseurl = https://cdn.redhat.com/content/eus/rhel9/9.4/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-9.4-appstream]
 name = rhel-9.4-appstream
-baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/appstream/os 
+baseurl = https://cdn.redhat.com/content/eus/rhel9/9.4/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
@@ -36,7 +36,7 @@ failovermethod = priority
 
 [rhel-9.4-nfv]
 name = rhel-9.4-nfv
-baseurl = https://cdn.redhat.com/content/beta/rhel9/9/x86_64/nfv/os
+baseurl = https://cdn.redhat.com/content/e4s/rhel9/9.4/x86_64/nfv/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