Deploy yum SVCs on build01

Makefile

@@ -1,3 +1,5 @@
+SHELL=/usr/bin/env bash -o errexit
+
 .PHONY: check check-core check-services dry-core-admin dry-services-admin core-admin services-admin dry-core core dry-services services all-admin all
 
 all: core-admin core services-admin services
@@ -305,6 +307,13 @@ prow-monitoring:
 	make -C cluster/ci/monitoring prow-monitoring-deploy
 .PHONY: prow-monitoring
 
+build-farm-consistency:
+	@echo "diffing ns-ttl-controller assets ..."
+	diff -Naup ./core-services/ci-ns-ttl-controller/ci-ns-ttl-controller_dc.yaml ./clusters/build-clusters/01_cluster/openshift/ci-ns-ttl-controller/ci-ns-ttl-controller_dc.yaml
+	@echo "diffing rpms-ocp assets ..."
+	for file in ./core-services/release-controller/rpms-ocp-*.yaml; do diff -Naup "$${file}" "./clusters/build-clusters/01_cluster/openshift/release-controller/$${file##*/}"; done
+.PHONY: build-farm-consistency
+
 logging:
 	$(MAKE) apply WHAT=cluster/ci/config/logging/fluentd-daemonset.yaml
 	$(MAKE) apply WHAT=cluster/ci/config/logging/fluentd-configmap.yaml

ci-operator/jobs/openshift/release/openshift-release-master-presubmits.yaml

@@ -18,6 +18,34 @@ presubmits:
           requests:
             cpu: 10m
     trigger: ((?m)^/test promrules,?(\s+|$))
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    context: ci/prow/build-farm-consistency
+    decorate: true
+    labels:
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-release-master-build-farm-consistency
+    rerun_command: /test build-farm-consistency
+    spec:
+      containers:
+      - args:
+        - -c
+        - |
+          set -o errexit
+          set -o nounset
+          set -o pipefail
+          make build-farm-consistency
+        command:
+        - /bin/bash
+        image: registry.svc.ci.openshift.org/openshift/release:golang-1.13
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+    trigger: (?m)^/test( | .* )build-farm-consistency,?($|\s.*)
   - agent: kubernetes
     always_run: true
     branches:

clusters/build-clusters/01_cluster/openshift/release-controller/content-mirror_imagestream.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ImageStream
+metadata:
+  name: content-mirror
+  namespace: ci
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - from:
+      kind: DockerImage
+      name: registry.svc.ci.openshift.org/ci/content-mirror:latest
+    importPolicy:
+      scheduled: true
+    name: "latest"

clusters/build-clusters/01_cluster/openshift/release-controller/ocp_namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ocp

clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.1.yaml

@@ -0,0 +1,72 @@
+apiVersion: v1
+kind: List
+items:
+
+# each RPM (group,release) pair gets a service and deployment to serve RPM content from the mirrors
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: base-4-1
+    namespace: ocp
+  spec:
+    selector:
+      app: base-4-1
+    ports:
+    - port: 80
+      targetPort: 8080
+    type: ClusterIP
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: base-4-1
+    namespace: ocp
+    labels:
+      app: base-4-1
+    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: base-4-1
+    template:
+      metadata:
+        labels:
+          app: base-4-1
+      spec:
+        volumes:
+        - name: repos
+          configMap:
+            name: base-repos
+            items:
+            - key: ocp-4.1-default.repo
+              path: ocp-4.1-default.repo
+        - name: key
+          secret:
+            secretName: mirror.openshift.com
+        - name: cache
+          emptyDir: {}
+        - name: run
+          emptyDir: {}
+        containers:
+        - name: mirror
+          ports:
+            - name: http
+              containerPort: 8080
+          volumeMounts:
+          - name: repos
+            mountPath: /tmp/repos
+            readOnly: true
+          - name: key
+            mountPath: /tmp/key
+            readOnly: true
+          - name: cache
+            mountPath: /tmp/cache
+          image: " "
+          workingDir: /tmp/repos
+          command:
+          - content-mirror
+          - --path=/tmp/config
+          - --max-size=5g
+          - --timeout=30m
+          - /tmp/repos

clusters/build-clusters/01_cluster/openshift/release-controller/rpms-ocp-4.2.yaml

@@ -0,0 +1,210 @@
+apiVersion: v1
+kind: List
+items:
+
+# each RPM (group,release) pair gets a service and deployment to serve RPM content from the mirrors
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: base-4-2
+    namespace: ocp
+  spec:
+    selector:
+      app: base-4-2
+    ports:
+    - port: 80
+      targetPort: 8080
+    type: ClusterIP
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: base-4-2
+    namespace: ocp
+    labels:
+      app: base-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: base-4-2
+    template:
+      metadata:
+        labels:
+          app: base-4-2
+      spec:
+        volumes:
+        - name: repos
+          configMap:
+            name: base-repos
+            items:
+            - key: ocp-4.2-default.repo
+              path: ocp-4.2-default.repo
+        - name: key
+          secret:
+            secretName: mirror.openshift.com
+        - name: cache
+          emptyDir: {}
+        - name: run
+          emptyDir: {}
+        containers:
+        - name: mirror
+          ports:
+            - name: http
+              containerPort: 8080
+          volumeMounts:
+          - name: repos
+            mountPath: /tmp/repos
+            readOnly: true
+          - name: key
+            mountPath: /tmp/key
+            readOnly: true
+          - name: cache
+            mountPath: /tmp/cache
+          image: " "
+          workingDir: /tmp/repos
+          command:
+          - content-mirror
+          - --path=/tmp/config
+          - --max-size=5g
+          - --timeout=30m
+          - /tmp/repos
+
+# OpenStack repos
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: base-openstack-4-2
+    namespace: ocp
+  spec:
+    selector:
+      app: base-openstack-4-2
+    ports:
+      - port: 80
+        targetPort: 8080
+    type: ClusterIP
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: base-openstack-4-2
+    namespace: ocp
+    labels:
+      app: base-openstack-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: base-openstack-4-2
+    template:
+      metadata:
+        labels:
+          app: base-openstack-4-2
+      spec:
+        volumes:
+          - name: repos
+            configMap:
+              name: base-repos
+              items:
+              - key: ocp-4.2-openstack.repo
+                path: ocp-4.2-openstack.repo
+          - name: key
+            secret:
+              secretName: mirror.openshift.com
+          - name: cache
+            emptyDir: {}
+          - name: run
+            emptyDir: {}
+        containers:
+          - name: mirror
+            ports:
+              - name: http
+                containerPort: 8080
+            volumeMounts:
+              - name: repos
+                mountPath: /tmp/repos
+                readOnly: true
+              - name: key
+                mountPath: /tmp/key
+                readOnly: true
+              - name: cache
+                mountPath: /tmp/cache
+            image: " "
+            workingDir: /tmp/repos
+            command:
+              - content-mirror
+              - --path=/tmp/config
+              - --max-size=5g
+              - --timeout=30m
+              - /tmp/repos
+
+# Multiarch repos
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: base-4-2-s390x
+    namespace: ocp
+  spec:
+    selector:
+      app: base-4-2-s390x
+    ports:
+    - port: 80
+      targetPort: 8080
+    type: ClusterIP
+- apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: base-4-2-s390x
+    namespace: ocp
+    labels:
+      app: base-4-2-s390x
+    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: base-4-2-s390x
+    template:
+      metadata:
+        labels:
+          app: base-4-2-s390x
+      spec:
+        volumes:
+        - name: repos
+          configMap:
+            name: base-repos
+            items:
+            - key: ocp-4.2-s390x.repo
+              path: ocp-4.2-s390x.repo
+        - name: key
+          secret:
+            secretName: mirror.openshift.com
+        - name: cache
+          emptyDir: {}
+        - name: run
+          emptyDir: {}
+        containers:
+        - name: mirror
+          ports:
+            - name: http
+              containerPort: 8080
+          volumeMounts:
+          - name: repos
+            mountPath: /tmp/repos
+            readOnly: true
+          - name: key
+            mountPath: /tmp/key
+            readOnly: true
+          - name: cache
+            mountPath: /tmp/cache
+          image: " "
+          workingDir: /tmp/repos
+          command:
+          - content-mirror
+          - --path=/tmp/config
+          - --max-size=5g
+          - --timeout=30m
+          - /tmp/repos