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

openshift-merge-bot[bot] · web-flow · commit fba847b86e58 · 2026-01-06T21:08:54.000Z
Automate config brancher by auto-config-brancher job at Tue, 06 Jan 2026 20:06:50 UTC
diff --git a/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-master.yaml b/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-master.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: 4.22-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-release-4.22.yaml b/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-release-4.22.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: 4.22-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-release-4.23.yaml b/ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-release-4.23.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: 4.23-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-main.yaml b/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-main.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.22-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
 build_root:
   from_repository: true
 canonical_go_repository: github.com/redhat-cne/cloud-event-proxy
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: cloud-event-proxy
 - dockerfile_path: examples/consumer.Dockerfile
   to: cloud-event-consumer
diff --git a/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-release-4.22.yaml b/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-release-4.22.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.22-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
 build_root:
   from_repository: true
 canonical_go_repository: github.com/redhat-cne/cloud-event-proxy
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: cloud-event-proxy
 - dockerfile_path: examples/consumer.Dockerfile
   to: cloud-event-consumer
diff --git a/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-release-4.23.yaml b/ci-operator/config/openshift-priv/cloud-event-proxy/openshift-priv-cloud-event-proxy-release-4.23.yaml
@@ -3,20 +3,20 @@ base_images:
     name: 4.23-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
 build_root:
   from_repository: true
 canonical_go_repository: github.com/redhat-cne/cloud-event-proxy
 images:
 - dockerfile_path: Dockerfile
   from: base
   inputs:
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: cloud-event-proxy
 - dockerfile_path: examples/consumer.Dockerfile
   to: cloud-event-consumer
diff --git a/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-main.yaml b/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-main.yaml
@@ -197,12 +197,18 @@ images:
     ocp_4.21_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_4.22_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
     ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
     ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: smb-csi-driver-operator
 - dockerfile_path: Dockerfile.test
   from: src
diff --git a/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-release-4.22.yaml b/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-release-4.22.yaml
@@ -197,12 +197,18 @@ images:
     ocp_4.21_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_4.22_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
     ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
     ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: smb-csi-driver-operator
 - dockerfile_path: Dockerfile.test
   from: src
diff --git a/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-release-4.23.yaml b/ci-operator/config/openshift-priv/csi-operator/openshift-priv-csi-operator-release-4.23.yaml
@@ -197,12 +197,18 @@ images:
     ocp_4.21_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_4.22_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
     ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
     ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: smb-csi-driver-operator
 - dockerfile_path: Dockerfile.test
   from: src
diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: "4.22"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master__okd-scos.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-master__okd-scos.yaml
@@ -22,7 +22,7 @@ images:
     ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
       - builder
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-release-4.22.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-release-4.22.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: "4.22"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-release-4.23.yaml b/ci-operator/config/openshift/aws-ebs-csi-driver/openshift-aws-ebs-csi-driver-release-4.23.yaml
@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.21_base-rhel9:
+  ocp_4.22_base-rhel9:
     name: "4.23"
     namespace: ocp
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.22:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.21
+    tag: rhel-9-golang-1.24-openshift-4.22
   tests-private:
     name: tests-private
     namespace: ci
@@ -22,12 +22,12 @@ canonical_go_repository: github.com/kubernetes-sigs/aws-ebs-csi-driver
 images:
 - dockerfile_path: Dockerfile.openshift.rhel7
   inputs:
-    ocp_4.21_base-rhel9:
+    ocp_4.22_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.21:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: aws-ebs-csi-driver
 promotion:
   to:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main.yaml
@@ -196,12 +196,18 @@ images:
     ocp_4.21_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_4.22_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
     ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
     ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: smb-csi-driver-operator
 - dockerfile_path: Dockerfile.test
   from: src
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.22.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.22.yaml
@@ -196,12 +196,18 @@ images:
     ocp_4.21_base-rhel9:
       as:
       - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_4.22_base-rhel9:
+      as:
+      - registry.ci.openshift.org/ocp/4.22:base-rhel9
     ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
     ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
       - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
+    ocp_builder_rhel-9-golang-1.24-openshift-4.22:
+      as:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22
   to: smb-csi-driver-operator
 - dockerfile_path: Dockerfile.test
   from: src
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-release-4.23.yaml
diff --git a/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-main.yaml b/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-main.yaml
diff --git a/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-release-4.22.yaml b/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-release-4.22.yaml
diff --git a/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-release-4.23.yaml b/ci-operator/config/redhat-cne/cloud-event-proxy/redhat-cne-cloud-event-proxy-release-4.23.yaml
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.54-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.16.54-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.46-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.17.46-x86-64-for-4.17.0-0-to-4.18.0-0_clusterimageset.yaml
diff --git a/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-21-amd64-aws-us-east-1_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/rh-openshift-ecosystem/rhoe-ocp-4-21-amd64-aws-us-east-1_clusterpool.yaml
