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

Automate config brancher by auto-config-brancher job at Tue, 07 Oct 2025 12:05:50 UTC

Author: openshift-merge-bot[bot]

ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-main.yaml

@@ -85,18 +85,13 @@ tests:
         MIRROR_IMAGES=true
     workflow: agent-e2e-generic
   timeout: 6h0m0s
-- as: e2e-agent-iso-no-registry-compact-ipv4
+- as: e2e-agent-compact-ipv4-iso-no-registry
   cluster: build05
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)
   steps:
     cluster_profile: equinix-ocp-metal
-    env:
-      DEVSCRIPTS_CONFIG: |
-        AGENT_E2E_TEST_SCENARIO=COMPACT_IPV4
-        AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
-        AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV=true
-    workflow: agent-e2e-generic
+    workflow: agent-e2e-compact-ipv4-iso-no-registry
   timeout: 6h0m0s
 - as: gofmt
   commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .

ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.19.yaml

@@ -85,18 +85,13 @@ tests:
         MIRROR_IMAGES=true
     workflow: agent-e2e-generic
   timeout: 6h0m0s
-- as: e2e-agent-iso-no-registry-compact-ipv4
+- as: e2e-agent-compact-ipv4-iso-no-registry
   cluster: build05
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)
   steps:
     cluster_profile: equinix-ocp-metal
-    env:
-      DEVSCRIPTS_CONFIG: |
-        AGENT_E2E_TEST_SCENARIO=COMPACT_IPV4
-        AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
-        AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV=true
-    workflow: agent-e2e-generic
+    workflow: agent-e2e-compact-ipv4-iso-no-registry
   timeout: 6h0m0s
 - as: gofmt
   commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .

ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.20.yaml

@@ -85,18 +85,13 @@ tests:
         MIRROR_IMAGES=true
     workflow: agent-e2e-generic
   timeout: 6h0m0s
-- as: e2e-agent-iso-no-registry-compact-ipv4
+- as: e2e-agent-compact-ipv4-iso-no-registry
   cluster: build05
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)
   steps:
     cluster_profile: equinix-ocp-metal
-    env:
-      DEVSCRIPTS_CONFIG: |
-        AGENT_E2E_TEST_SCENARIO=COMPACT_IPV4
-        AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
-        AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV=true
-    workflow: agent-e2e-generic
+    workflow: agent-e2e-compact-ipv4-iso-no-registry
   timeout: 6h0m0s
 - as: gofmt
   commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .

ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.21.yaml

@@ -86,18 +86,13 @@ tests:
         MIRROR_IMAGES=true
     workflow: agent-e2e-generic
   timeout: 6h0m0s
-- as: e2e-agent-iso-no-registry-compact-ipv4
+- as: e2e-agent-compact-ipv4-iso-no-registry
   cluster: build05
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)
   steps:
     cluster_profile: equinix-ocp-metal
-    env:
-      DEVSCRIPTS_CONFIG: |
-        AGENT_E2E_TEST_SCENARIO=COMPACT_IPV4
-        AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
-        AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV=true
-    workflow: agent-e2e-generic
+    workflow: agent-e2e-compact-ipv4-iso-no-registry
   timeout: 6h0m0s
 - as: gofmt
   commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .

ci-operator/config/openshift-priv/agent-installer-utils/openshift-priv-agent-installer-utils-release-4.22.yaml

@@ -85,18 +85,13 @@ tests:
         MIRROR_IMAGES=true
     workflow: agent-e2e-generic
   timeout: 6h0m0s
-- as: e2e-agent-iso-no-registry-compact-ipv4
+- as: e2e-agent-compact-ipv4-iso-no-registry
   cluster: build05
   optional: true
   skip_if_only_changed: (^docs/)|((^|/)OWNERS(_ALIASES)?$)|((^|/)[A-Z]+\.md$)
   steps:
     cluster_profile: equinix-ocp-metal
-    env:
-      DEVSCRIPTS_CONFIG: |
-        AGENT_E2E_TEST_SCENARIO=COMPACT_IPV4
-        AGENT_E2E_TEST_BOOT_MODE=ISO_NO_REGISTRY
-        AGENT_CLEANUP_ISO_BUILDER_CACHE_LOCAL_DEV=true
-    workflow: agent-e2e-generic
+    workflow: agent-e2e-compact-ipv4-iso-no-registry
   timeout: 6h0m0s
 - as: gofmt
   commands: IS_CONTAINER=TRUE ./hack/go-fmt.sh .

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.20_base-rhel9:
+  ocp_4.21_base-rhel9:
     name: 4.21-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.20
+    tag: rhel-9-golang-1.24-openshift-4.21
   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.20_base-rhel9:
+    ocp_4.21_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.20:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+      - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: aws-ebs-csi-driver
 promotion:
   to:

ci-operator/config/openshift-priv/aws-ebs-csi-driver/openshift-priv-aws-ebs-csi-driver-release-4.21.yaml

@@ -3,14 +3,14 @@ base_images:
     name: commitchecker
     namespace: ci
     tag: latest
-  ocp_4.20_base-rhel9:
+  ocp_4.21_base-rhel9:
     name: 4.21-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.20
+    tag: rhel-9-golang-1.24-openshift-4.21
   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.20_base-rhel9:
+    ocp_4.21_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.20:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+      - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: aws-ebs-csi-driver
 promotion:
   to:

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.20_base-rhel9:
+  ocp_4.21_base-rhel9:
     name: 4.22-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.20
+    tag: rhel-9-golang-1.24-openshift-4.21
   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.20_base-rhel9:
+    ocp_4.21_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.20:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+      - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: aws-ebs-csi-driver
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-main.yaml

@@ -27,27 +27,27 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.20_base-rhel9:
+  ocp_4.21_base-rhel9:
     name: 4.21-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.20
+    tag: rhel-9-golang-1.24-openshift-4.21
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-kube-apiserver-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
   inputs:
-    ocp_4.20_base-rhel9:
+    ocp_4.21_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.20:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+      - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: cluster-kube-apiserver-operator
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-kube-apiserver-operator/openshift-priv-cluster-kube-apiserver-operator-release-4.21.yaml

@@ -27,27 +27,27 @@ base_images:
     name: test
     namespace: ocp-kni
     tag: dev-scripts
-  ocp_4.20_base-rhel9:
+  ocp_4.21_base-rhel9:
     name: 4.21-priv
     namespace: ocp-private
     tag: base-rhel9
-  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.21:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.24-openshift-4.20
+    tag: rhel-9-golang-1.24-openshift-4.21
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-kube-apiserver-operator
 images:
 - dockerfile_path: Dockerfile.rhel7
   inputs:
-    ocp_4.20_base-rhel9:
+    ocp_4.21_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.20:base-rhel9
-    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
+      - registry.ci.openshift.org/ocp/4.21:base-rhel9
+    ocp_builder_rhel-9-golang-1.24-openshift-4.21:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21
   to: cluster-kube-apiserver-operator
 promotion:
   to: