Merge pull request openshift#61177 from openshift-bot/auto-config-bra…

…ncher Automate config brancher by auto-config-brancher job at Mon, 03 Feb 2025 12:05:48 UTC
MaxMood96 · Feb 3, 2025 · 26bb3c7 · 26bb3c7
2 parents b87ffea + 36aff75
commit 26bb3c7
Show file tree

Hide file tree

Showing 44 changed files with 121 additions and 211 deletions.
diff --git a/...fig/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml b/...fig/openshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-master.yaml
@@ -31,10 +31,10 @@ base_images:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -45,9 +45,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/...enshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.19.yaml b/...enshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.19.yaml
@@ -31,10 +31,10 @@ base_images:
     name: 4.19-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -45,9 +45,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/...enshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.20.yaml b/...enshift-priv/cluster-etcd-operator/openshift-priv-cluster-etcd-operator-release-4.20.yaml
@@ -31,10 +31,10 @@ base_images:
     name: 4.20-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -45,9 +45,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/...erator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml b/...erator/config/openshift-priv/machine-os-images/openshift-priv-machine-os-images-main.yaml
@@ -48,8 +48,8 @@ resources:
       memory: 200Mi
 tests:
 - as: shellcheck
-  commands: find . -type f -path "./scripts/*" -o -name "*.sh" -exec shellcheck -s
-    bash {} \+
+  commands: find . -type f \( -path "./scripts/*" -o -name "*.sh" \) -exec shellcheck
+    -s bash {} \+
   container:
     from: src
   run_if_changed: (^scripts/)|(\.sh$)|(^\.ci-operator\.yaml$)

diff --git a/...onfig/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.19.yaml b/...onfig/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.19.yaml
@@ -49,8 +49,8 @@ resources:
       memory: 200Mi
 tests:
 - as: shellcheck
-  commands: find . -type f -path "./scripts/*" -o -name "*.sh" -exec shellcheck -s
-    bash {} \+
+  commands: find . -type f \( -path "./scripts/*" -o -name "*.sh" \) -exec shellcheck
+    -s bash {} \+
   container:
     from: src
   run_if_changed: (^scripts/)|(\.sh$)|(^\.ci-operator\.yaml$)

diff --git a/...onfig/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.20.yaml b/...onfig/openshift-priv/machine-os-images/openshift-priv-machine-os-images-release-4.20.yaml
@@ -48,8 +48,8 @@ resources:
       memory: 200Mi
 tests:
 - as: shellcheck
-  commands: find . -type f -path "./scripts/*" -o -name "*.sh" -exec shellcheck -s
-    bash {} \+
+  commands: find . -type f \( -path "./scripts/*" -o -name "*.sh" \) -exec shellcheck
+    -s bash {} \+
   container:
     from: src
   run_if_changed: (^scripts/)|(\.sh$)|(^\.ci-operator\.yaml$)

diff --git a/...priv/openstack-resource-controller/openshift-priv-openstack-resource-controller-main.yaml b/...priv/openstack-resource-controller/openshift-priv-openstack-resource-controller-main.yaml
diff --git a/...indows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml b/...indows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
-  openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+    tag: rhel-9-golang-1.22-openshift-4.19
+  openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.18
+    tag: rhel-9-release-golang-1.22-openshift-4.19
   operator-sdk:
     name: "4.19"
     namespace: origin
@@ -27,12 +27,12 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator
 images:
 - dockerfile_path: build/Dockerfile.ci
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
-    openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19
+    openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.19
   to: windows-machine-config-operator-test
 operator:
   bundles:

diff --git a/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.19.yaml b/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.19.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
-  openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+    tag: rhel-9-golang-1.22-openshift-4.19
+  openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.18
+    tag: rhel-9-release-golang-1.22-openshift-4.19
   operator-sdk:
     name: "4.19"
     namespace: origin
@@ -27,12 +27,12 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator
 images:
 - dockerfile_path: build/Dockerfile.ci
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
-    openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19
+    openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.19
   to: windows-machine-config-operator-test
 operator:
   bundles:

diff --git a/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.20.yaml b/...-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.20.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
-  openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+    tag: rhel-9-golang-1.22-openshift-4.19
+  openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.18
+    tag: rhel-9-release-golang-1.22-openshift-4.19
   operator-sdk:
     name: "4.20"
     namespace: origin
@@ -27,12 +27,12 @@ canonical_go_repository: github.com/openshift/windows-machine-config-operator
 images:
 - dockerfile_path: build/Dockerfile.ci
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
-    openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19
+    openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.19
   to: windows-machine-config-operator-test
 operator:
   bundles:

diff --git a/...erator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml b/...erator/config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master.yaml
@@ -31,10 +31,10 @@ base_images:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -44,9 +44,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/...fig/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master__okd-scos.yaml b/...fig/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-master__okd-scos.yaml
@@ -22,7 +22,7 @@ images:
     ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
       - builder
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/.../config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.19.yaml b/.../config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.19.yaml
@@ -31,10 +31,10 @@ base_images:
     name: "4.19"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -44,9 +44,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/.../config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.20.yaml b/.../config/openshift/cluster-etcd-operator/openshift-cluster-etcd-operator-release-4.20.yaml
@@ -31,10 +31,10 @@ base_images:
     name: "4.20"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.23-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
+    tag: rhel-9-golang-1.23-openshift-4.19
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
@@ -44,9 +44,9 @@ images:
     ocp_4.18_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.18:base-rhel9
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.23-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19
   to: cluster-etcd-operator
 promotion:
   to:

diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.20.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.20.yaml
@@ -47,8 +47,8 @@ resources:
       memory: 200Mi
 tests:
 - as: shellcheck
-  commands: find . -type f -path "./scripts/*" -o -name "*.sh" -exec shellcheck -s
-    bash {} \+
+  commands: find . -type f \( -path "./scripts/*" -o -name "*.sh" \) -exec shellcheck
+    -s bash {} \+
   container:
     from: src
   run_if_changed: (^scripts/)|(\.sh$)|(^\.ci-operator\.yaml$)

diff --git a/...ift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml b/...ift/windows-machine-config-operator/openshift-windows-machine-config-operator-master.yaml
@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+  ocp_builder_rhel-9-golang-1.22-openshift-4.19:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.22-openshift-4.18
-  openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+    tag: rhel-9-golang-1.22-openshift-4.19
+  openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.22-openshift-4.18
+    tag: rhel-9-release-golang-1.22-openshift-4.19
   operator-sdk:
     name: "4.19"
     namespace: origin
@@ -26,12 +26,12 @@ build_root:
 images:
 - dockerfile_path: build/Dockerfile.ci
   inputs:
-    ocp_builder_rhel-9-golang-1.22-openshift-4.18:
+    ocp_builder_rhel-9-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18
-    openshift_release_rhel-9-release-golang-1.22-openshift-4.18:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19
+    openshift_release_rhel-9-release-golang-1.22-openshift-4.19:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.19
   to: windows-machine-config-operator-test
 operator:
   bundles: