From da8fc6ebfbafbb9f6ee4b50e695caee0f3f9fc4d Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Fri, 23 Aug 2019 15:47:24 +0200 Subject: [PATCH 1/2] Add openstack beta repos mirror In order to be able to properly test latest features of ironic and related services, we need to enable the beta openstack repos with the latest content available. --- Makefile | 8 +++ .../repos/ocp-4.2-openstack-beta-rhel8.repo | 10 ++++ .../repos/ocp-4.3-openstack-beta-rhel8.repo | 10 ++++ .../release-controller/rpms-ocp-4.2.yaml | 60 +++++++++++++++++++ .../release-controller/rpms-ocp-4.3.yaml | 60 +++++++++++++++++++ 5 files changed, 148 insertions(+) create mode 100644 ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo create mode 100644 ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo diff --git a/Makefile b/Makefile index 72d7a9998419..4e79b1913c26 100644 --- a/Makefile +++ b/Makefile @@ -179,6 +179,10 @@ prow-ocp-rpm-secrets: --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack.repo \ -o yaml --dry-run | oc apply -n ocp -f - + oc create secret generic openstack-beta-rhel8-4-2-repos \ + --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ + --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo \ + -o yaml --dry-run | oc apply -n ocp -f - oc create secret generic base-4-3-repos \ --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-default.repo \ @@ -187,6 +191,10 @@ prow-ocp-rpm-secrets: --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack.repo \ -o yaml --dry-run | oc apply -n ocp -f - + oc create secret generic openstack-beta-rhel8-4-3-repos \ + --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ + --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo \ + -o yaml --dry-run | oc apply -n ocp -f - .PHONY: prow-ocp-rpms-secrets prow-jobs: prow-cluster-jobs prow-artifacts diff --git a/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo b/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo new file mode 100644 index 000000000000..7d4d3eaa2275 --- /dev/null +++ b/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo @@ -0,0 +1,10 @@ +[openstack-beta-rhel8] +name = rhel-openstack +baseurl = https://use-mirror1.ops.rhcloud.com/enterprise/reposync/4.2/ocp-4.2-openstack-beta-rhel8/ + https://use-mirror2.ops.rhcloud.com/enterprise/reposync/4.2/ocp-4.2-openstack-beta-rhel8/ +sslverify = false +sslclientkey = ops-mirror.pem +sslclientcert = ops-mirror.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 diff --git a/ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo b/ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo new file mode 100644 index 000000000000..23a6d002c214 --- /dev/null +++ b/ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo @@ -0,0 +1,10 @@ +[openstack-beta-rhel8] +name = rhel-openstack +baseurl = https://use-mirror1.ops.rhcloud.com/enterprise/reposync/4.3/ocp-4.3-openstack-beta-rhel8/ + https://use-mirror2.ops.rhcloud.com/enterprise/reposync/4.3/ocp-4.3-openstack-beta-rhel8/ +sslverify = false +sslclientkey = ops-mirror.pem +sslclientcert = ops-mirror.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 diff --git a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml index 5e82f0468cfb..f5c0f29f5991 100644 --- a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml +++ b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml @@ -121,3 +121,63 @@ items: - --max-size=5g - --timeout=30m - /tmp/repos + +- apiVersion: v1 + kind: Service + metadata: + name: openstack-beta-rhel8-4-2 + namespace: ocp + spec: + selector: + app: openstack-beta-rhel8-4-2 + ports: + - port: 80 + targetPort: 8080 + type: ClusterIP +- apiVersion: apps/v1 + kind: Deployment + metadata: + name: openstack-beta-rhel8-4-2 + namespace: ocp + labels: + app: openstack-beta-rhel8-4-2 + annotations: + image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]' + spec: + replicas: 2 + selector: + matchLabels: + app: openstack-beta-rhel8-4-2 + template: + metadata: + labels: + app: openstack-beta-rhel8-4-2 + spec: + volumes: + - name: repos + secret: + secretName: openstack-beta-rhel8-4-2-repos + - name: cache + emptyDir: {} + - name: run + emptyDir: {} + containers: + - name: mirror + ports: + - name: http + containerPort: 8080 + volumeMounts: + - name: repos + mountPath: /tmp/repos + readOnly: true + - name: cache + mountPath: /tmp/cache + image: " " + workingDir: /tmp/repos + command: + - content-mirror + - --path=/tmp/config + - --max-size=5g + - --timeout=30m + - /tmp/repos + diff --git a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml index e13e6fa48824..8dc110c2d19c 100644 --- a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml +++ b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml @@ -121,3 +121,63 @@ items: - --max-size=5g - --timeout=30m - /tmp/repos + +- apiVersion: v1 + kind: Service + metadata: + name: openstack-beta-rhel8-4-3 + namespace: ocp + spec: + selector: + app: openstack-beta-rhel8-4-3 + ports: + - port: 80 + targetPort: 8080 + type: ClusterIP +- apiVersion: apps/v1 + kind: Deployment + metadata: + name: openstack-beta-rhel8-4-3 + namespace: ocp + labels: + app: openstack-beta-rhel8-4-3 + annotations: + image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]' + spec: + replicas: 2 + selector: + matchLabels: + app: openstack-beta-rhel8-4-3 + template: + metadata: + labels: + app: openstack-beta-rhel8-4-3 + spec: + volumes: + - name: repos + secret: + secretName: openstack-beta-rhel8-4-3-repos + - name: cache + emptyDir: {} + - name: run + emptyDir: {} + containers: + - name: mirror + ports: + - name: http + containerPort: 8080 + volumeMounts: + - name: repos + mountPath: /tmp/repos + readOnly: true + - name: cache + mountPath: /tmp/cache + image: " " + workingDir: /tmp/repos + command: + - content-mirror + - --path=/tmp/config + - --max-size=5g + - --timeout=30m + - /tmp/repos + From 8aed8535e5a7d1697dbf054b6098539d2b2d4f76 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 28 Aug 2019 16:47:10 -0400 Subject: [PATCH 2/2] Remove OpenStack beta RPM repos for 4.2 The side-effect of this is that no 4.2 images will ever be built with the correct RPMs as the the original configuration that was supplied in the upstream image build process pointed to the prior release's software. Performing as a separate change so the prior configuration can be recovered and reviewed as opposed to force-push overwrite. --- Makefile | 8 +-- .../repos/ocp-4.2-openstack-beta-rhel8.repo | 10 ---- ...rhel8.repo => ocp-4.3-openstack-beta.repo} | 0 .../release-controller/rpms-ocp-4.2.yaml | 60 ------------------- .../release-controller/rpms-ocp-4.3.yaml | 14 ++--- 5 files changed, 9 insertions(+), 83 deletions(-) delete mode 100644 ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo rename ci-operator/infra/openshift/release-controller/repos/{ocp-4.3-openstack-beta-rhel8.repo => ocp-4.3-openstack-beta.repo} (100%) diff --git a/Makefile b/Makefile index 4e79b1913c26..8ce0f225a014 100644 --- a/Makefile +++ b/Makefile @@ -179,10 +179,6 @@ prow-ocp-rpm-secrets: --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack.repo \ -o yaml --dry-run | oc apply -n ocp -f - - oc create secret generic openstack-beta-rhel8-4-2-repos \ - --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ - --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo \ - -o yaml --dry-run | oc apply -n ocp -f - oc create secret generic base-4-3-repos \ --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-default.repo \ @@ -191,9 +187,9 @@ prow-ocp-rpm-secrets: --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack.repo \ -o yaml --dry-run | oc apply -n ocp -f - - oc create secret generic openstack-beta-rhel8-4-3-repos \ + oc create secret generic base-openstack-beta-4-3-repos \ --from-file=cluster/test-deploy/gcp/ops-mirror.pem \ - --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo \ + --from-file=ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta.repo \ -o yaml --dry-run | oc apply -n ocp -f - .PHONY: prow-ocp-rpms-secrets diff --git a/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo b/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo deleted file mode 100644 index 7d4d3eaa2275..000000000000 --- a/ci-operator/infra/openshift/release-controller/repos/ocp-4.2-openstack-beta-rhel8.repo +++ /dev/null @@ -1,10 +0,0 @@ -[openstack-beta-rhel8] -name = rhel-openstack -baseurl = https://use-mirror1.ops.rhcloud.com/enterprise/reposync/4.2/ocp-4.2-openstack-beta-rhel8/ - https://use-mirror2.ops.rhcloud.com/enterprise/reposync/4.2/ocp-4.2-openstack-beta-rhel8/ -sslverify = false -sslclientkey = ops-mirror.pem -sslclientcert = ops-mirror.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 diff --git a/ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo b/ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta.repo similarity index 100% rename from ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta-rhel8.repo rename to ci-operator/infra/openshift/release-controller/repos/ocp-4.3-openstack-beta.repo diff --git a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml index f5c0f29f5991..5e82f0468cfb 100644 --- a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml +++ b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.2.yaml @@ -121,63 +121,3 @@ items: - --max-size=5g - --timeout=30m - /tmp/repos - -- apiVersion: v1 - kind: Service - metadata: - name: openstack-beta-rhel8-4-2 - namespace: ocp - spec: - selector: - app: openstack-beta-rhel8-4-2 - ports: - - port: 80 - targetPort: 8080 - type: ClusterIP -- apiVersion: apps/v1 - kind: Deployment - metadata: - name: openstack-beta-rhel8-4-2 - namespace: ocp - labels: - app: openstack-beta-rhel8-4-2 - annotations: - image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]' - spec: - replicas: 2 - selector: - matchLabels: - app: openstack-beta-rhel8-4-2 - template: - metadata: - labels: - app: openstack-beta-rhel8-4-2 - spec: - volumes: - - name: repos - secret: - secretName: openstack-beta-rhel8-4-2-repos - - name: cache - emptyDir: {} - - name: run - emptyDir: {} - containers: - - name: mirror - ports: - - name: http - containerPort: 8080 - volumeMounts: - - name: repos - mountPath: /tmp/repos - readOnly: true - - name: cache - mountPath: /tmp/cache - image: " " - workingDir: /tmp/repos - command: - - content-mirror - - --path=/tmp/config - - --max-size=5g - - --timeout=30m - - /tmp/repos - diff --git a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml index 8dc110c2d19c..321c723a061d 100644 --- a/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml +++ b/ci-operator/infra/openshift/release-controller/rpms-ocp-4.3.yaml @@ -125,11 +125,11 @@ items: - apiVersion: v1 kind: Service metadata: - name: openstack-beta-rhel8-4-3 + name: openstack-beta-4-3 namespace: ocp spec: selector: - app: openstack-beta-rhel8-4-3 + app: openstack-beta-4-3 ports: - port: 80 targetPort: 8080 @@ -137,26 +137,26 @@ items: - apiVersion: apps/v1 kind: Deployment metadata: - name: openstack-beta-rhel8-4-3 + name: openstack-beta-4-3 namespace: ocp labels: - app: openstack-beta-rhel8-4-3 + app: openstack-beta-4-3 annotations: image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"content-mirror:latest","namespace":"ci"},"fieldPath":"spec.template.spec.containers[?(@.name==\"mirror\")].image"}]' spec: replicas: 2 selector: matchLabels: - app: openstack-beta-rhel8-4-3 + app: openstack-beta-4-3 template: metadata: labels: - app: openstack-beta-rhel8-4-3 + app: openstack-beta-4-3 spec: volumes: - name: repos secret: - secretName: openstack-beta-rhel8-4-3-repos + secretName: base-openstack-beta-4-3-repos - name: cache emptyDir: {} - name: run