Revert "Merge pull request #6508 from hongkailiu/revertMigration"

ci-operator/config/openshift/ci-secret-mirroring-controller/openshift-ci-secret-mirroring-controller-master.yaml

@@ -3,8 +3,14 @@ base_images:
     cluster: https://api.ci.openshift.org
     name: centos
     namespace: openshift
-    tag: '7'
+    tag: "7"
 binary_build_commands: make install
+build_root:
+  image_stream_tag:
+    cluster: https://api.ci.openshift.org
+    name: release
+    namespace: openshift
+    tag: golang-1.12
 images:
 - context_dir: image/
   from: os
@@ -15,6 +21,7 @@ images:
         source_path: /go/bin/ci-secret-mirroring-controller
   to: ci-secret-mirroring-controller
 promotion:
+  name: ""
   namespace: ci
   tag: latest
 resources:
@@ -24,12 +31,6 @@ resources:
     requests:
       cpu: 100m
       memory: 200Mi
-build_root:
-  image_stream_tag:
-    cluster: https://api.ci.openshift.org
-    name: release
-    namespace: openshift
-    tag: golang-1.12
 tag_specification:
   cluster: https://api.ci.openshift.org
   name: "4.3"

ci-operator/config/openshift/origin/openshift-origin-master.yaml

@@ -1,27 +1,33 @@
 base_images:
   base:
+    cluster: https://api.ci.openshift.org
     name: "4.4"
     namespace: ocp
     tag: base
   base-machine:
+    cluster: https://api.ci.openshift.org
     name: fedora
     namespace: openshift
     tag: "29"
   cli:
+    cluster: https://api.ci.openshift.org
     name: "4.4"
     namespace: ocp
     tag: cli
   machine-os-content-base:
+    cluster: https://api.ci.openshift.org
     name: "4.4"
     namespace: ocp
     tag: machine-os-content
   oc-rpms:
+    cluster: https://api.ci.openshift.org
     name: "4.4"
     namespace: ocp
     tag: oc-rpms
 binary_build_commands: make build
 build_root:
   image_stream_tag:
+    cluster: https://api.ci.openshift.org
     name: release
     namespace: openshift
     tag: golang-1.13
@@ -110,10 +116,10 @@ resources:
       memory: 4Gi
   artifacts:
     limits:
-      memory: 1Gi
+      memory: 6Gi
     requests:
-      cpu: 100m
-      memory: 100Mi
+      cpu: 500m
+      memory: 3Gi
   bin:
     limits:
       memory: 12Gi
@@ -182,6 +188,7 @@ resources:
       memory: 8Gi
 rpm_build_commands: make build-rpms
 tag_specification:
+  cluster: https://api.ci.openshift.org
   name: "4.4"
   namespace: ocp
 tests:

ci-operator/jobs/openshift/origin/openshift-origin-master-postsubmits.yaml

@@ -21,6 +21,8 @@ postsubmits:
         - --artifact-dir=$(ARTIFACTS)
         - --branch=master
         - --give-pr-author-access-to-namespace=true
+        - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+        - --kubeconfig=/etc/apici/kubeconfig
         - --org=openshift
         - --promote
         - --repo=origin
@@ -43,11 +45,26 @@ postsubmits:
           requests:
             cpu: 10m
         volumeMounts:
+        - mountPath: /etc/apici
+          name: apici-ci-operator-credentials
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
         - mountPath: /etc/sentry-dsn
           name: sentry-dsn
           readOnly: true
       serviceAccountName: ci-operator
       volumes:
+      - name: apici-ci-operator-credentials
+        secret:
+          items:
+          - key: sa.ci-operator.apici.config
+            path: kubeconfig
+          secretName: apici-ci-operator-credentials
+      - name: pull-secret
+        secret:
+          secretName: regcred
       - name: sentry-dsn
         secret:
           secretName: sentry-dsn