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

Automate config brancher by auto-config-brancher job at Tue, 19 Aug 2025 20:07:02 UTC

Author: openshift-merge-bot[bot]

ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-main.yaml

@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.19_base-rhel9:
+  ocp_4.20_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
     tag: base-rhel9
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.19
+    tag: rhel-9-release-golang-1.24-openshift-4.20
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-resource-override-admission
 images:
 - dockerfile_path: images/ci/Dockerfile
   inputs:
-    ocp_4.19_base-rhel9:
+    ocp_4.20_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.19:base-rhel9
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+      - registry.ci.openshift.org/ocp/4.20:base-rhel9
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: cluster-resource-override-admission
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.20.yaml

@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.19_base-rhel9:
+  ocp_4.20_base-rhel9:
     name: 4.20-priv
     namespace: ocp-private
     tag: base-rhel9
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.19
+    tag: rhel-9-release-golang-1.24-openshift-4.20
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-resource-override-admission
 images:
 - dockerfile_path: images/ci/Dockerfile
   inputs:
-    ocp_4.19_base-rhel9:
+    ocp_4.20_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.19:base-rhel9
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+      - registry.ci.openshift.org/ocp/4.20:base-rhel9
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: cluster-resource-override-admission
 promotion:
   to:

ci-operator/config/openshift-priv/cluster-resource-override-admission/openshift-priv-cluster-resource-override-admission-release-4.21.yaml

@@ -1,25 +1,25 @@
 base_images:
-  ocp_4.19_base-rhel9:
+  ocp_4.20_base-rhel9:
     name: 4.21-priv
     namespace: ocp-private
     tag: base-rhel9
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.19
+    tag: rhel-9-release-golang-1.24-openshift-4.20
 binary_build_commands: make build --warn-undefined-variables
 build_root:
   from_repository: true
 canonical_go_repository: github.com/openshift/cluster-resource-override-admission
 images:
 - dockerfile_path: images/ci/Dockerfile
   inputs:
-    ocp_4.19_base-rhel9:
+    ocp_4.20_base-rhel9:
       as:
-      - registry.ci.openshift.org/ocp/4.19:base-rhel9
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.19:
+      - registry.ci.openshift.org/ocp/4.20:base-rhel9
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.19
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: cluster-resource-override-admission
 promotion:
   to:

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

@@ -590,14 +590,19 @@ tests:
     workflow: openshift-e2e-gcp
   timeout: 6h0m0s
 - always_run: false
-  as: e2e-gcp-custom-dns
+  as: e2e-gcp-custom-dns-techpreview
   optional: true
   run_if_changed: (gcp|google)
   steps:
     cluster_profile: gcp-qe
     env:
-      FEATURE_GATES: '["GCPClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-gcp-custom-dns
   timeout: 6h0m0s

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

@@ -561,14 +561,19 @@ tests:
     workflow: openshift-e2e-gcp
   timeout: 6h0m0s
 - always_run: false
-  as: e2e-gcp-custom-dns
+  as: e2e-gcp-custom-dns-techpreview
   optional: true
   run_if_changed: (gcp|google)
   steps:
     cluster_profile: gcp-qe
     env:
-      FEATURE_GATES: '["GCPClusterHostedDNS=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-gcp-custom-dns
   timeout: 6h0m0s

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

@@ -591,14 +591,19 @@ tests:
     workflow: openshift-e2e-gcp
   timeout: 6h0m0s
 - always_run: false
-  as: e2e-gcp-custom-dns
+  as: e2e-gcp-custom-dns-techpreview
   optional: true
   run_if_changed: (gcp|google)
   steps:
     cluster_profile: gcp-qe
     env:
-      FEATURE_GATES: '["GCPClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-gcp-custom-dns
   timeout: 6h0m0s

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

@@ -590,14 +590,19 @@ tests:
     workflow: openshift-e2e-gcp
   timeout: 6h0m0s
 - always_run: false
-  as: e2e-gcp-custom-dns
+  as: e2e-gcp-custom-dns-techpreview
   optional: true
   run_if_changed: (gcp|google)
   steps:
     cluster_profile: gcp-qe
     env:
-      FEATURE_GATES: '["GCPClusterHostedDNSInstall=true"]'
-      FEATURE_SET: CustomNoUpgrade
+      FEATURE_SET: TechPreviewNoUpgrade
+      TEST_SKIPS: DNS should provide DNS for the cluster \| Aggregator Should be able
+        to support the 1.17 Sample API Server using the current Aggregator \| Ensure
+        HTTPRoute object is created \| Ensure LB, service, and dnsRecord are created
+        for a Gateway object \| The HAProxy router should pass the http2 tests \|
+        The HAProxy router should pass the gRPC interoperability tests \| Services
+        should fail health check node port if there are only terminating endpoints
       USER_PROVISIONED_DNS: "yes"
     workflow: openshift-e2e-gcp-custom-dns
   timeout: 6h0m0s

ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-master.yaml

@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.23-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.23-openshift-4.20
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+    tag: rhel-9-golang-1.24-openshift-4.20
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.20
+    tag: rhel-9-release-golang-1.24-openshift-4.20
   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.23-openshift-4.20:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: windows-machine-config-operator-test
 operator:
   bundles:

ci-operator/config/openshift-priv/windows-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.23-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.23-openshift-4.20
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+    tag: rhel-9-golang-1.24-openshift-4.20
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.20
+    tag: rhel-9-release-golang-1.24-openshift-4.20
   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.23-openshift-4.20:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: windows-machine-config-operator-test
 operator:
   bundles:

ci-operator/config/openshift-priv/windows-machine-config-operator/openshift-priv-windows-machine-config-operator-release-4.21.yaml

@@ -1,12 +1,12 @@
 base_images:
-  ocp_builder_rhel-9-golang-1.23-openshift-4.20:
+  ocp_builder_rhel-9-golang-1.24-openshift-4.20:
     name: builder
     namespace: ocp
-    tag: rhel-9-golang-1.23-openshift-4.20
-  openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+    tag: rhel-9-golang-1.24-openshift-4.20
+  openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
     name: release
     namespace: openshift
-    tag: rhel-9-release-golang-1.23-openshift-4.20
+    tag: rhel-9-release-golang-1.24-openshift-4.20
   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.23-openshift-4.20:
+    ocp_builder_rhel-9-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20
-    openshift_release_rhel-9-release-golang-1.23-openshift-4.20:
+      - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20
+    openshift_release_rhel-9-release-golang-1.24-openshift-4.20:
       as:
-      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.23-openshift-4.20
+      - registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.24-openshift-4.20
   to: windows-machine-config-operator-test
 operator:
   bundles: