From 7088b3a26d27ea7b34951bfc0f96031006deb80e Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Wed, 20 May 2026 15:21:38 -0400 Subject: [PATCH] Downsize GCP ARM Compute Instances We're hitting capacity exhaustion issues (GCP does not have enough ARM machines for us) causing nightlies to fail. This drops compute nodes to the minimum requirement size, which is a much more readily available instance size. --- ...main__nightly-4.20-upgrade-from-nightly-4.19.yaml | 2 +- ...-main__nightly-4.20-upgrade-from-stable-4.19.yaml | 2 +- ...main__nightly-4.21-upgrade-from-nightly-4.20.yaml | 2 +- ...-main__nightly-4.21-upgrade-from-stable-4.20.yaml | 2 +- .../openshift-multiarch-main__nightly-4.21.yaml | 2 +- ...main__nightly-4.22-upgrade-from-nightly-4.21.yaml | 4 ++-- ...-main__nightly-4.22-upgrade-from-stable-4.21.yaml | 4 ++-- .../openshift-multiarch-main__nightly-4.22.yaml | 8 ++++---- ...main__nightly-4.23-upgrade-from-nightly-4.22.yaml | 2 +- ...-main__nightly-4.23-upgrade-from-stable-4.22.yaml | 2 +- .../openshift-multiarch-main__nightly-4.23.yaml | 8 ++++---- ...-main__nightly-5.0-upgrade-from-nightly-4.22.yaml | 4 ++-- ...h-main__nightly-5.0-upgrade-from-stable-4.22.yaml | 4 ++-- .../openshift-multiarch-main__nightly-5.0.yaml | 12 ++++++------ 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-nightly-4.19.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-nightly-4.19.yaml index af5859c34509b..b2800c1962601 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-nightly-4.19.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-nightly-4.19.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-stable-4.19.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-stable-4.19.yaml index 787c346989f89..47210146c87ad 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-stable-4.19.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.20-upgrade-from-stable-4.19.yaml @@ -98,7 +98,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml index a08ad13fc9d8e..eb248225eb21b 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-nightly-4.20.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-stable-4.20.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-stable-4.20.yaml index 79c4a669b45d2..7a1c61ea9f92b 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-stable-4.20.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21-upgrade-from-stable-4.20.yaml @@ -98,7 +98,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21.yaml index c1e4254c3fe45..56e3d1fc2b292 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.21.yaml @@ -714,7 +714,7 @@ tests: cluster_profile: openshift-org-gcp env: MIGRATION_CP_MACHINE_TYPE: t2a-standard-4 - MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-4 + MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-2 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image builds should succeed\| build can reference a cluster service\| custom build diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-nightly-4.21.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-nightly-4.21.yaml index 4ce5a7ea2dc81..e8e17352abaf6 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-nightly-4.21.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-nightly-4.21.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp @@ -101,7 +101,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-stable-4.21.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-stable-4.21.yaml index aa9d10cd9ec03..f04fb7f9f05f5 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-stable-4.21.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-stable-4.21.yaml @@ -98,7 +98,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp @@ -108,7 +108,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml index f9a646c4d5ac8..d0886474cef13 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml @@ -777,7 +777,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 OCP_ARCH: arm64 ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) @@ -788,7 +788,7 @@ tests: cluster_profile: openshift-org-gcp env: MIGRATION_CP_MACHINE_TYPE: t2a-standard-4 - MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-4 + MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-2 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image builds should succeed\| build can reference a cluster service\| custom build @@ -812,7 +812,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 MIGRATION_ARCHITECTURE: x86_64 MIGRATION_CP_MACHINE_TYPE: n2-standard-4 @@ -841,7 +841,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-nightly-4.22.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-nightly-4.22.yaml index a2751865082db..5dfd62af1fc59 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-nightly-4.22.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-nightly-4.22.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-stable-4.22.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-stable-4.22.yaml index 5482b52a65218..b72caa8c153f4 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-stable-4.22.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-stable-4.22.yaml @@ -98,7 +98,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml index ff69409dbb19d..cec3fc34e043a 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml @@ -746,7 +746,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 OCP_ARCH: arm64 ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) @@ -757,7 +757,7 @@ tests: cluster_profile: openshift-org-gcp env: MIGRATION_CP_MACHINE_TYPE: t2a-standard-4 - MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-4 + MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-2 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image builds should succeed\| build can reference a cluster service\| custom build @@ -781,7 +781,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 MIGRATION_ARCHITECTURE: x86_64 MIGRATION_CP_MACHINE_TYPE: n2-standard-4 @@ -810,7 +810,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 CONTROL_PLANE_NODE_TYPE: t2a-standard-4 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-nightly-4.22.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-nightly-4.22.yaml index a9b11fbb91771..0f6c74100b96a 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-nightly-4.22.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-nightly-4.22.yaml @@ -91,7 +91,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp @@ -101,7 +101,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-stable-4.22.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-stable-4.22.yaml index f256b486558ae..1408a79e0e71c 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-stable-4.22.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0-upgrade-from-stable-4.22.yaml @@ -98,7 +98,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance workflow: openshift-upgrade-gcp @@ -108,7 +108,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0.yaml index d92693cfb0748..5aa0482a45d71 100644 --- a/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0.yaml +++ b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-5.0.yaml @@ -717,7 +717,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) workflow: openshift-e2e-gcp-ovn @@ -727,7 +727,7 @@ tests: cluster_profile: openshift-org-gcp env: MIGRATION_CP_MACHINE_TYPE: t2a-standard-4 - MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-4 + MIGRATION_INFRA_MACHINE_TYPE: t2a-standard-2 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| FIPS TestFIPS\| Multi-stage image builds should succeed\| Optimized image builds should succeed\| build can reference a cluster service\| custom build @@ -751,7 +751,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 MIGRATION_ARCHITECTURE: x86_64 MIGRATION_CP_MACHINE_TYPE: n2-standard-4 MIGRATION_INFRA_MACHINE_TYPE: n2-standard-4 @@ -779,7 +779,7 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: t2a-standard-4 + COMPUTE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) @@ -791,7 +791,7 @@ tests: env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 ADDITIONAL_WORKER_DISK_TYPE: pd-standard - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| @@ -841,7 +841,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance