From 4f1a04ac3f5056aa21de148f69aa6a18c03071fb Mon Sep 17 00:00:00 2001 From: Micah Abbott Date: Tue, 18 May 2021 11:28:38 -0400 Subject: [PATCH] repos: add RHEL 8.3 repo for use in openshift/os Prow jobs RHCOs 4.7 will be using RHEL 8.3 in the short term, until after OCP 4.8 GAs. While changes to 4.7 are unlikely during this time, it would be useful to have the ability to run Prow jobs on the `release-4.7` branch of `openshift/os` with the correct content. --- .../release-controller/rpms-ocp-4.7.yaml | 80 ++++++++++++++++ .../_repos/ocp-4.7-rhel83.repo | 91 +++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 core-services/release-controller/_repos/ocp-4.7-rhel83.repo diff --git a/clusters/build-clusters/common/release-controller/rpms-ocp-4.7.yaml b/clusters/build-clusters/common/release-controller/rpms-ocp-4.7.yaml index dd99fd33dc86e..b8b7a4e5a1331 100644 --- a/clusters/build-clusters/common/release-controller/rpms-ocp-4.7.yaml +++ b/clusters/build-clusters/common/release-controller/rpms-ocp-4.7.yaml @@ -488,6 +488,86 @@ spec: # art_rpm_mirroring_services.py added the following resource #--------------------------------------------------------------------------------- +apiVersion: v1 +kind: Service +metadata: + name: base-4-7-rhel83 + namespace: ocp +spec: + ports: + - port: 80 + targetPort: 8080 + selector: + app: base-4-7-rhel83 + 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-7-rhel83 + name: base-4-7-rhel83 + namespace: ocp +spec: + replicas: 2 + selector: + matchLabels: + app: base-4-7-rhel83 + template: + metadata: + labels: + app: base-4-7-rhel83 + spec: + containers: + - command: + - content-mirror + - --path=/tmp/config + - --max-size=5g + - --timeout=30m + - /tmp/repos + image: ' ' + 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/cache + name: cache + workingDir: /tmp/repos + volumes: + - configMap: + items: + - key: ocp-4.7-rhel83.repo + path: ocp-4.7-rhel83.repo + name: base-repos + name: repos + - name: key + secret: + secretName: mirror.openshift.com + - 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.7-rhel83.repo b/core-services/release-controller/_repos/ocp-4.7-rhel83.repo new file mode 100644 index 0000000000000..c7b43295816f0 --- /dev/null +++ b/core-services/release-controller/_repos/ocp-4.7-rhel83.repo @@ -0,0 +1,91 @@ +[rhel-8-baseos] +name = rhel-8-baseos +baseurl = https://cdn.redhat.com/content/dist/rhel8/8.3/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.3/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://use-mirror1.ops.rhcloud.com/enterprise/reposync/4.7/rhel-8-server-ose-rpms + https://use-mirror2.ops.rhcloud.com/enterprise/reposync/4.7/rhel-8-server-ose-rpms +sslverify = false +sslclientkey = /tmp/key/ops-mirror.pem +sslclientcert = /tmp/key/ops-mirror.pem +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.3/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-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/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/dist/rhel8/8.3/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