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

Automate config brancher by auto-config-brancher job at Tue, 27 Jul 2021 15:03:24 UTC
openshift · Jul 27, 2021 · 644a927 · 644a927
2 parents 5aca473 + a7c541f
commit 644a927
Show file tree

Hide file tree

Showing 18 changed files with 118 additions and 50 deletions.
diff --git a/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.8.yaml b/ci-operator/config/openshift-priv/builder/openshift-priv-builder-release-4.8.yaml
@@ -15,6 +15,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -33,9 +37,9 @@ images:
 - dockerfile_path: Dockerfile.rhel8
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: docker-builder
 promotion:
   name: 4.8-priv

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
@@ -32,7 +32,7 @@ images:
   inputs:
     ocp_builder_rhel-8-golang-1.15-openshift-4.7:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
   to: cluster-authentication-operator
 promotion:
   name: 4.7-priv

diff --git a/...r-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.8.yaml b/...r-image-registry-operator/openshift-priv-cluster-image-registry-operator-release-4.8.yaml
@@ -15,6 +15,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -33,9 +37,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: cluster-image-registry-operator
 promotion:
   name: 4.8-priv

diff --git a/...v/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.8.yaml b/...v/containernetworking-plugins/openshift-priv-containernetworking-plugins-release-4.8.yaml
@@ -11,6 +11,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-7-golang-1.15-openshift-4.7
+  ocp_builder_rhel-7-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-7-golang-1.16-openshift-4.8
   ocp_builder_rhel-7-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -23,6 +27,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.7
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -37,12 +45,12 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-7-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-7-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.7
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+      - registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.8
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: container-networking-plugins
 promotion:
   name: 4.8-priv

diff --git a/...v/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.8.yaml b/...v/multus-admission-controller/openshift-priv-multus-admission-controller-release-4.8.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.6
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -21,9 +25,9 @@ images:
 - dockerfile_path: Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: multus-admission-controller
 promotion:
   name: 4.8-priv

diff --git a/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.8.yaml b/ci-operator/config/openshift-priv/must-gather/openshift-priv-must-gather-release-4.8.yaml
@@ -19,6 +19,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -35,9 +39,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: must-gather
 promotion:
   name: 4.8-priv

diff --git a/...r/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.8.yaml b/...r/config/openshift-priv/ovirt-csi-driver/openshift-priv-ovirt-csi-driver-release-4.8.yaml
@@ -19,6 +19,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -34,9 +38,9 @@ images:
 - dockerfile_path: Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: ovirt-csi-driver
 promotion:
   name: 4.8-priv

diff --git a/...l-static-provisioner/openshift-priv-sig-storage-local-static-provisioner-release-4.8.yaml b/...l-static-provisioner/openshift-priv-sig-storage-local-static-provisioner-release-4.8.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.7
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
 build_root:
   image_stream_tag:
     name: release
@@ -17,9 +21,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: local-storage-static-provisioner
 promotion:
   name: 4.8-priv

diff --git a/...nshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.8.yaml b/...nshift-priv/sriov-network-operator/openshift-priv-sriov-network-operator-release-4.8.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.7
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
 build_root:
   image_stream_tag:
     name: release
@@ -17,25 +21,23 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: sriov-network-operator
 - dockerfile_path: Dockerfile.sriov-network-config-daemon.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: sriov-network-config-daemon
 - dockerfile_path: Dockerfile.webhook.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: sriov-network-webhook
 promotion:
   name: 4.8-priv

diff --git a/ci-operator/config/openshift/builder/openshift-builder-release-4.8.yaml b/ci-operator/config/openshift/builder/openshift-builder-release-4.8.yaml
@@ -15,6 +15,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -32,9 +36,9 @@ images:
 - dockerfile_path: Dockerfile.rhel8
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: docker-builder
 promotion:
   name: "4.8"

diff --git a/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.7.yaml b/...luster-authentication-operator/openshift-cluster-authentication-operator-release-4.7.yaml
@@ -31,7 +31,7 @@ images:
   inputs:
     ocp_builder_rhel-8-golang-1.15-openshift-4.7:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
   to: cluster-authentication-operator
 promotion:
   name: "4.7"

diff --git a/...luster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.8.yaml b/...luster-image-registry-operator/openshift-cluster-image-registry-operator-release-4.8.yaml
@@ -15,6 +15,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -32,9 +36,9 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: cluster-image-registry-operator
 promotion:
   name: "4.8"

diff --git a/...nshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.8.yaml b/...nshift/containernetworking-plugins/openshift-containernetworking-plugins-release-4.8.yaml
@@ -11,6 +11,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-7-golang-1.15-openshift-4.7
+  ocp_builder_rhel-7-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-7-golang-1.16-openshift-4.8
   ocp_builder_rhel-7-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -23,6 +27,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.7
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -36,12 +44,12 @@ images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-7-golang-1.15-openshift-4.7:
+    ocp_builder_rhel-7-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-7-golang-1.15-openshift-4.7
-    ocp_builder_rhel-8-golang-1.15-openshift-4.7:
+      - registry.ci.openshift.org/ocp/builder:rhel-7-golang-1.16-openshift-4.8
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: container-networking-plugins
 promotion:
   name: "4.8"

diff --git a/...nshift/multus-admission-controller/openshift-multus-admission-controller-release-4.8.yaml b/...nshift/multus-admission-controller/openshift-multus-admission-controller-release-4.8.yaml
@@ -7,6 +7,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.6
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -20,9 +24,9 @@ images:
 - dockerfile_path: Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.6:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: multus-admission-controller
 promotion:
   name: "4.8"

diff --git a/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.8.yaml b/ci-operator/config/openshift/must-gather/openshift-must-gather-release-4.8.yaml
@@ -19,6 +19,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -34,9 +38,9 @@ images:
 - dockerfile_path: Dockerfile.rhel7
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: must-gather
 promotion:
   name: "4.8"

diff --git a/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.8.yaml b/ci-operator/config/openshift/ovirt-csi-driver/openshift-ovirt-csi-driver-release-4.8.yaml
@@ -19,6 +19,10 @@ base_images:
     name: builder
     namespace: ocp
     tag: rhel-8-golang-1.15-openshift-4.8
+  ocp_builder_rhel-8-golang-1.16-openshift-4.8:
+    name: builder
+    namespace: ocp
+    tag: rhel-8-golang-1.16-openshift-4.8
   ocp_builder_rhel-8-golang-openshift-4.6:
     name: builder
     namespace: ocp
@@ -34,9 +38,9 @@ images:
 - dockerfile_path: Dockerfile.openshift
   from: base
   inputs:
-    ocp_builder_rhel-8-golang-1.15-openshift-4.8:
+    ocp_builder_rhel-8-golang-1.16-openshift-4.8:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.8
+      - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8
   to: ovirt-csi-driver
 promotion:
   name: "4.8"