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 145f2cdd88476..4ce5a7ea2dc81 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 @@ -101,7 +101,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 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 45784bebeb5e6..aa9d10cd9ec03 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 @@ -108,8 +108,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-4 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-4 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 9795518d998c4..b1068dffd4497 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,8 +777,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) workflow: openshift-e2e-gcp-ovn @@ -787,8 +787,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - MIGRATION_CP_MACHINE_TYPE: c4a-standard-2 - MIGRATION_INFRA_MACHINE_TYPE: c4a-standard-2 + MIGRATION_CP_MACHINE_TYPE: t2a-standard-2 + 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,8 +812,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 MIGRATION_ARCHITECTURE: x86_64 MIGRATION_CP_MACHINE_TYPE: n2-standard-4 MIGRATION_INFRA_MACHINE_TYPE: n2-standard-4 @@ -841,8 +841,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) @@ -853,8 +853,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| @@ -904,8 +903,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + 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.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 40c8293ec38d8..a2751865082db 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 @@ -101,8 +101,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + 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.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 8d5e645b6477a..5482b52a65218 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 @@ -108,8 +108,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + 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.23.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml index dc73211e9920f..d9d47f82bb605 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,8 +746,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) workflow: openshift-e2e-gcp-ovn @@ -756,8 +756,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - MIGRATION_CP_MACHINE_TYPE: c4a-standard-2 - MIGRATION_INFRA_MACHINE_TYPE: c4a-standard-2 + MIGRATION_CP_MACHINE_TYPE: t2a-standard-2 + 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,8 +781,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 MIGRATION_ARCHITECTURE: x86_64 MIGRATION_CP_MACHINE_TYPE: n2-standard-4 MIGRATION_INFRA_MACHINE_TYPE: n2-standard-4 @@ -810,8 +810,8 @@ tests: steps: cluster_profile: openshift-org-gcp env: - COMPUTE_NODE_TYPE: c4a-standard-2 - CONTROL_PLANE_NODE_TYPE: c4a-standard-2 + COMPUTE_NODE_TYPE: t2a-standard-2 + CONTROL_PLANE_NODE_TYPE: t2a-standard-2 OCP_ARCH: arm64 TEST_TYPE: upgrade-conformance ZONES_EXCLUSION_PATTERN: (asia-southeast1-a|us-central1-c) @@ -822,8 +822,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SKIPS: deploymentconfigs\| should expose cluster services outside the cluster\| @@ -873,8 +872,7 @@ tests: cluster_profile: openshift-org-gcp env: ADDITIONAL_WORKER_ARCHITECTURE: aarch64 - ADDITIONAL_WORKER_DISK_TYPE: hyperdisk-balanced - ADDITIONAL_WORKER_VM_TYPE: c4a-standard-2 + ADDITIONAL_WORKER_VM_TYPE: t2a-standard-2 COMPUTE_NODE_REPLICAS: "2" OCP_ARCH: amd64 TEST_SUITE: upgrade-conformance