Merge pull request #12034 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Sat, 19 Sep 2020 08:02:54 UTC
openshift · Sep 19, 2020 · 072b95d · 072b95d
2 parents 5617cd1 + 0cb6f34
commit 072b95d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/ci-operator/config/openshift-priv/loki/openshift-priv-loki-release-4.7.yaml b/ci-operator/config/openshift-priv/loki/openshift-priv-loki-release-4.7.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.7-priv
     namespace: ocp-private
     tag: base
+  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
@@ -28,9 +32,9 @@ images:
 - dockerfile_path: Dockerfile.promtail.ocp
   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
     openshift_release_golang-1.12:
       as:
       - registry.svc.ci.openshift.org/openshift/release:golang-1.12

diff --git a/...penshift-priv/node-problem-detector/openshift-priv-node-problem-detector-release-4.6.yaml b/...penshift-priv/node-problem-detector/openshift-priv-node-problem-detector-release-4.6.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: golang-1.10
+  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
@@ -25,9 +29,9 @@ images:
 - dockerfile_path: Dockerfile.openshift.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: node-problem-detector
 promotion:
   disabled: true

diff --git a/...-priv/ovirt-csi-driver-operator/openshift-priv-ovirt-csi-driver-operator-release-4.6.yaml b/...-priv/ovirt-csi-driver-operator/openshift-priv-ovirt-csi-driver-operator-release-4.6.yaml
@@ -3,6 +3,10 @@ base_images:
     name: 4.6-priv
     namespace: ocp-private
     tag: base
+  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
@@ -18,9 +22,9 @@ images:
 - dockerfile_path: Dockerfile
   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: ovirt-csi-driver-operator
 promotion:
   disabled: true