ci-operator-config-mirror --config-path ./ci-operator/config --to-org…

… openshift-priv --only-org openshift --whitelist-file ./core-services/openshift-priv/_whitelist.yaml
wking · Sep 17, 2020 · 8e6b7ae · 8e6b7ae
1 parent a842318
commit 8e6b7ae
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 18 deletions.
diff --git a/...luster-authentication-operator/openshift-priv-cluster-authentication-operator-master.yaml b/...luster-authentication-operator/openshift-priv-cluster-authentication-operator-master.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -22,9 +26,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-authentication-operator
 promotion:
   name: 4.6-priv

diff --git a/...r-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.6.yaml b/...r-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.6.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -22,9 +26,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-authentication-operator
 promotion:
   disabled: true

diff --git a/...r-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.7.yaml b/...r-authentication-operator/openshift-priv-cluster-authentication-operator-release-4.7.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -22,9 +26,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-authentication-operator
 promotion:
   name: 4.7-priv

diff --git a/...enshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml b/...enshift-priv/cluster-version-operator/openshift-priv-cluster-version-operator-master.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -29,9 +33,9 @@ images:
 - dockerfile_path: Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-version-operator
 promotion:
   name: 4.6-priv

diff --git a/...ft-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.6.yaml b/...ft-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.6.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -29,9 +33,9 @@ images:
 - dockerfile_path: Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-version-operator
 promotion:
   disabled: true

diff --git a/...ft-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.7.yaml b/...ft-priv/cluster-version-operator/openshift-priv-cluster-version-operator-release-4.7.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.14
+  ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.15-openshift-4.6
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -29,9 +33,9 @@ images:
 - dockerfile_path: Dockerfile.rhel
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6
+      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
   to: cluster-version-operator
 promotion:
   name: 4.7-priv

diff --git a/...openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml b/...openshift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-master.yaml
@@ -15,7 +15,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.13
+    tag: golang-1.14
 canonical_go_repository: github.com/openshift/file-integrity-operator
 images:
 - dockerfile_path: Dockerfile.ci

diff --git a/...hift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.6.yaml b/...hift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.6.yaml
@@ -15,7 +15,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.13
+    tag: golang-1.14
 canonical_go_repository: github.com/openshift/file-integrity-operator
 images:
 - dockerfile_path: Dockerfile.ci

diff --git a/...hift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.7.yaml b/...hift-priv/file-integrity-operator/openshift-priv-file-integrity-operator-release-4.7.yaml
@@ -15,7 +15,7 @@ build_root:
   image_stream_tag:
     name: release
     namespace: openshift
-    tag: golang-1.13
+    tag: golang-1.14
 canonical_go_repository: github.com/openshift/file-integrity-operator
 images:
 - dockerfile_path: Dockerfile.ci

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-master.yaml
@@ -270,7 +270,7 @@ tests:
 - as: e2e-crc
   steps:
     cluster_profile: gcp
-    workflow: openshift-e2e-crc
+    workflow: openshift-e2e-gcp-crc
 zz_generated_metadata:
   branch: master
   org: openshift-priv

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.6.yaml
@@ -271,7 +271,7 @@ tests:
 - as: e2e-crc
   steps:
     cluster_profile: gcp
-    workflow: openshift-e2e-crc
+    workflow: openshift-e2e-gcp-crc
 zz_generated_metadata:
   branch: release-4.6
   org: openshift-priv

diff --git a/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml b/ci-operator/config/openshift-priv/installer/openshift-priv-installer-release-4.7.yaml
@@ -270,7 +270,7 @@ tests:
 - as: e2e-crc
   steps:
     cluster_profile: gcp
-    workflow: openshift-e2e-crc
+    workflow: openshift-e2e-gcp-crc
 zz_generated_metadata:
   branch: release-4.7
   org: openshift-priv