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

Automate config brancher by auto-config-brancher job at Mon, 23 Dec 2024 00:04:18 UTC
openshift · Dec 23, 2024 · 31faf5b · 31faf5b
2 parents 3194735 + ec3fd5a
commit 31faf5b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 4 deletions.
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
@@ -121,6 +121,8 @@ tests:
   steps:
     cluster_profile: azure4
     env:
+      COMPUTE_NODE_REPLICAS: "1"
+      CONTROL_PLANE_REPLICAS: "1"
       WINDOWS_SERVER_VERSION: "2019"
     test:
     - ref: windows-e2e-operator-test

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
@@ -122,6 +122,8 @@ tests:
   steps:
     cluster_profile: azure4
     env:
+      COMPUTE_NODE_REPLICAS: "1"
+      CONTROL_PLANE_REPLICAS: "1"
       WINDOWS_SERVER_VERSION: "2019"
     test:
     - ref: windows-e2e-operator-test

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
@@ -121,6 +121,8 @@ tests:
   steps:
     cluster_profile: azure4
     env:
+      COMPUTE_NODE_REPLICAS: "1"
+      CONTROL_PLANE_REPLICAS: "1"
       WINDOWS_SERVER_VERSION: "2019"
     test:
     - ref: windows-e2e-operator-test

diff --git a/...ndows-machine-config-operator/openshift-windows-machine-config-operator-release-4.19.yaml b/...ndows-machine-config-operator/openshift-windows-machine-config-operator-release-4.19.yaml
@@ -121,6 +121,8 @@ tests:
   steps:
     cluster_profile: azure4
     env:
+      COMPUTE_NODE_REPLICAS: "1"
+      CONTROL_PLANE_REPLICAS: "1"
       WINDOWS_SERVER_VERSION: "2019"
     test:
     - ref: windows-e2e-operator-test

diff --git a/...ndows-machine-config-operator/openshift-windows-machine-config-operator-release-4.20.yaml b/...ndows-machine-config-operator/openshift-windows-machine-config-operator-release-4.20.yaml
@@ -120,6 +120,8 @@ tests:
   steps:
     cluster_profile: azure4
     env:
+      COMPUTE_NODE_REPLICAS: "1"
+      CONTROL_PLANE_REPLICAS: "1"
       WINDOWS_SERVER_VERSION: "2019"
     test:
     - ref: windows-e2e-operator-test

diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-fips-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
@@ -20,7 +20,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.18.0-rc.2-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.0-rc.3-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: fips-install-config-aws-us-east-2

diff --git a/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml b/clusters/hosted-mgmt/hive/pools/cvp/cvp-ocp-4-18-amd64-aws-us-east-2_clusterpool.yaml
@@ -19,7 +19,7 @@ spec:
   hibernationConfig:
     resumeTimeout: 15m0s
   imageSetRef:
-    name: ocp-release-4.18.0-rc.2-x86-64-for-4.18.0-0-to-4.19.0-0
+    name: ocp-release-4.18.0-rc.3-x86-64-for-4.18.0-0-to-4.19.0-0
   installAttemptsLimit: 1
   installConfigSecretTemplateRef:
     name: install-config-aws-us-east-2

diff --git a/...4.18.0-0-to-4.19.0-0_clusterimageset.yaml → ...4.18.0-0-to-4.19.0-0_clusterimageset.yaml b/...4.18.0-0-to-4.19.0-0_clusterimageset.yaml → ...4.18.0-0-to-4.19.0-0_clusterimageset.yaml
@@ -6,7 +6,7 @@ metadata:
     version_stream: 4-stable
     version_upper: 4.19.0-0
   creationTimestamp: null
-  name: ocp-release-4.18.0-rc.2-x86-64-for-4.18.0-0-to-4.19.0-0
+  name: ocp-release-4.18.0-rc.3-x86-64-for-4.18.0-0-to-4.19.0-0
 spec:
-  releaseImage: quay.io/openshift-release-dev/ocp-release:4.18.0-rc.2-x86_64
+  releaseImage: quay.io/openshift-release-dev/ocp-release:4.18.0-rc.3-x86_64
 status: {}