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

openshift-merge-bot[bot] · web-flow · commit fce50766a6e9 · 2026-01-07T00:17:23.000Z
Automate config brancher by auto-config-brancher job at Wed, 07 Jan 2026 00:06:13 UTC
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
@@ -152,12 +152,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
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
@@ -152,12 +152,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
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
@@ -152,12 +152,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
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
@@ -151,12 +151,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
diff --git a/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml b/ci-operator/config/openshift/csi-operator/openshift-csi-operator-main__okd-scos.yaml
@@ -23,6 +23,7 @@ images:
       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: azure-file-csi-driver-operator
 - build_args:
   - name: TAGS
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
@@ -151,12 +151,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
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
@@ -151,12 +151,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: azure-file-csi-driver-operator
 - dockerfile_path: Dockerfile.openstack-cinder
   inputs:
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.60-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.15.60-x86-64-for-4.15.0-0-to-4.16.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.15.0-0
+    version_stream: 4-stable
     version_upper: 4.16.0-0
   creationTimestamp: null
   name: ocp-release-4.15.60-x86-64-for-4.15.0-0-to-4.16.0-0
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
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.17.0-0
+    version_stream: 4-stable
     version_upper: 4.18.0-0
   creationTimestamp: null
   name: ocp-release-4.17.46-x86-64-for-4.17.0-0-to-4.18.0-0
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.30-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.18.30-x86-64-for-4.18.0-0-to-4.19.0-0_clusterimageset.yaml
@@ -3,7 +3,6 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.18.0-0
-    version_stream: 4-stable
     version_upper: 4.19.0-0
   creationTimestamp: null
   name: ocp-release-4.18.30-x86-64-for-4.18.0-0-to-4.19.0-0
diff --git a/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.21-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml b/clusters/hosted-mgmt/hive/pools/ocp-release-4.19.21-x86-64-for-4.19.0-0-to-4.20.0-0_clusterimageset.yaml
@@ -3,6 +3,7 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.19.0-0
+    version_stream: 4-stable
     version_upper: 4.20.0-0
   creationTimestamp: null
   name: ocp-release-4.19.21-x86-64-for-4.19.0-0-to-4.20.0-0
