diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.17.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.17.yaml index bda1c99487222..3d96e269a8d29 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.17.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.17.yaml @@ -535,7 +535,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.18.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.18.yaml index fec426f144e1f..b77b280b437b1 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.18.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.18.yaml @@ -678,7 +678,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.19.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.19.yaml index a4db835e15d43..b05e9974e8aba 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.19.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.19.yaml @@ -911,7 +911,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.20.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.20.yaml index 0a6168b28f6f3..e442780cabef3 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.20.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.20.yaml @@ -967,7 +967,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml index 0f06c96d5a14b..3f9f7a16885c7 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.21.yaml @@ -1186,7 +1186,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.22.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.22.yaml index 9ff8e261fae76..1063f16933ced 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.22.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-4.22.yaml @@ -1204,7 +1204,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.0.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.0.yaml index 5c3d4afc1e9e2..4c6fb603fe3d7 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.0.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.0.yaml @@ -1204,7 +1204,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.1.yaml b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.1.yaml index 763e67dfcc963..6936f0cf76dd9 100644 --- a/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.1.yaml +++ b/ci-operator/config/openshift/verification-tests/openshift-verification-tests-main__installation-nightly-5.1.yaml @@ -1204,7 +1204,7 @@ tests: cluster_profile: gcp-qe env: COMPUTE_DISK_TYPE: hyperdisk-balanced - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n4-standard-2 COMPUTE_SERVICE_ACCOUNT: installer-dev-worker-sa CONTROL_PLANE_DISK_TYPE: hyperdisk-balanced CONTROL_PLANE_NODE_TYPE: n4-standard-4 diff --git a/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml index f8efa2ce14af8..ac7091e744aea 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-infra-periodics.yaml @@ -1353,7 +1353,7 @@ periodics: cluster_profile: $(CLUSTER_TYPE) env: CLUSTER_DURATION: $(CLUSTER_DURATION) - COMPUTE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n2-standard-4 test: - ref: clusterbot-wait workflow: ipi-$(CLUSTER_TYPE) diff --git a/ci-operator/step-registry/code-ready/crc/e2e/code-ready-crc-e2e-workflow.yaml b/ci-operator/step-registry/code-ready/crc/e2e/code-ready-crc-e2e-workflow.yaml index 8ec492b21de20..80c94cae57b2a 100644 --- a/ci-operator/step-registry/code-ready/crc/e2e/code-ready-crc-e2e-workflow.yaml +++ b/ci-operator/step-registry/code-ready/crc/e2e/code-ready-crc-e2e-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: code-ready-crc-e2e steps: env: - MACHINE_TYPE: n4-standard-16 + MACHINE_TYPE: n2-standard-16 + CPU_PLATFORM: "Intel Cascade Lake" pre: - chain: upi-gcp-nested-pre test: diff --git a/ci-operator/step-registry/code-ready/crc/integration/code-ready-crc-integration-workflow.yaml b/ci-operator/step-registry/code-ready/crc/integration/code-ready-crc-integration-workflow.yaml index 92241064c0cd5..2b29ca3e1cd80 100644 --- a/ci-operator/step-registry/code-ready/crc/integration/code-ready-crc-integration-workflow.yaml +++ b/ci-operator/step-registry/code-ready/crc/integration/code-ready-crc-integration-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: code-ready-crc-integration steps: env: - MACHINE_TYPE: n4-standard-16 + MACHINE_TYPE: n2-standard-16 + CPU_PLATFORM: "Intel Cascade Lake" pre: - chain: upi-gcp-nested-pre test: diff --git a/ci-operator/step-registry/code-ready/crc/microshift/code-ready-crc-microshift-workflow.yaml b/ci-operator/step-registry/code-ready/crc/microshift/code-ready-crc-microshift-workflow.yaml index 3f8b749cfe110..4c6b48a6d8a94 100644 --- a/ci-operator/step-registry/code-ready/crc/microshift/code-ready-crc-microshift-workflow.yaml +++ b/ci-operator/step-registry/code-ready/crc/microshift/code-ready-crc-microshift-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: code-ready-crc-microshift steps: env: - MACHINE_TYPE: n4-standard-16 + MACHINE_TYPE: n2-standard-16 + CPU_PLATFORM: "Intel Cascade Lake" pre: - chain: upi-gcp-nested-pre test: diff --git a/ci-operator/step-registry/code-ready/snc/e2e/code-ready-snc-e2e-workflow.yaml b/ci-operator/step-registry/code-ready/snc/e2e/code-ready-snc-e2e-workflow.yaml index 37cdadfb024f6..30511c37f7728 100644 --- a/ci-operator/step-registry/code-ready/snc/e2e/code-ready-snc-e2e-workflow.yaml +++ b/ci-operator/step-registry/code-ready/snc/e2e/code-ready-snc-e2e-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: code-ready-snc-e2e steps: env: - MACHINE_TYPE: n4-standard-16 + MACHINE_TYPE: n2-standard-16 + CPU_PLATFORM: "Intel Cascade Lake" pre: - chain: upi-gcp-nested-pre test: diff --git a/ci-operator/step-registry/code-ready/snc/microshift/code-ready-snc-microshift-workflow.yaml b/ci-operator/step-registry/code-ready/snc/microshift/code-ready-snc-microshift-workflow.yaml index aace044ae8ad2..64058057515c3 100644 --- a/ci-operator/step-registry/code-ready/snc/microshift/code-ready-snc-microshift-workflow.yaml +++ b/ci-operator/step-registry/code-ready/snc/microshift/code-ready-snc-microshift-workflow.yaml @@ -2,7 +2,8 @@ workflow: as: code-ready-snc-microshift steps: env: - MACHINE_TYPE: n4-standard-16 + MACHINE_TYPE: n2-standard-16 + CPU_PLATFORM: "Intel Cascade Lake" pre: - chain: upi-gcp-nested-pre - ref: code-ready-snc-subscription diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/clusters/provision/cucushift-installer-rehearse-gcp-cases-clusters-provision-commands.sh b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/clusters/provision/cucushift-installer-rehearse-gcp-cases-clusters-provision-commands.sh index 133a4fbc09b48..4c72924197214 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/clusters/provision/cucushift-installer-rehearse-gcp-cases-clusters-provision-commands.sh +++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/clusters/provision/cucushift-installer-rehearse-gcp-cases-clusters-provision-commands.sh @@ -444,8 +444,8 @@ fi if [[ "${IS_EXPENSIVE_MACHINE}" == "true" ]]; then # Scenario 1: Use specified control-plane but default worker for initial config - DEFAULT_COMPUTE_INSTANCE_TYPE="n4-standard-4" - DEFAULT_COMPUTE_FAMILY="N4" + DEFAULT_COMPUTE_INSTANCE_TYPE="n2-standard-2" + DEFAULT_COMPUTE_FAMILY="N2" if [[ "${COMPUTE_ARCH}" == "arm64" ]]; then DEFAULT_COMPUTE_INSTANCE_TYPE="t2a-standard-2" DEFAULT_COMPUTE_FAMILY="T2A" diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/valid-confidential-computing/provision/cucushift-installer-rehearse-gcp-cases-valid-confidential-computing-provision-commands.sh b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/valid-confidential-computing/provision/cucushift-installer-rehearse-gcp-cases-valid-confidential-computing-provision-commands.sh index 6bedb54c828f6..7e462aaa09361 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/valid-confidential-computing/provision/cucushift-installer-rehearse-gcp-cases-valid-confidential-computing-provision-commands.sh +++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/cases/valid-confidential-computing/provision/cucushift-installer-rehearse-gcp-cases-valid-confidential-computing-provision-commands.sh @@ -55,7 +55,7 @@ declare -A instance_type_supported_cc_type_dict=( [c2d-standard-4]="AMDEncryptedVirtualization Enabled" [c3d-standard-4]="AMDEncryptedVirtualization Enabled" [c3-standard-4]="IntelTrustedDomainExtensions" - [n4-standard-4]="" + [n2-standard-4]="" ) declare -A instance_type_unsupported_cc_type_dict=( @@ -63,7 +63,7 @@ declare -A instance_type_unsupported_cc_type_dict=( [c2d-standard-4]="IntelTrustedDomainExtensions AMDEncryptedVirtualizationNestedPaging" [c3d-standard-4]="IntelTrustedDomainExtensions AMDEncryptedVirtualizationNestedPaging" [c3-standard-4]="AMDEncryptedVirtualization AMDEncryptedVirtualizationNestedPaging Enabled" - [n4-standard-4]="AMDEncryptedVirtualization AMDEncryptedVirtualizationNestedPaging Enabled IntelTrustedDomainExtensions" + [n2-standard-4]="AMDEncryptedVirtualization AMDEncryptedVirtualizationNestedPaging Enabled IntelTrustedDomainExtensions" ) function save_artifacts() diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/c3-metal/private/cucushift-installer-rehearse-gcp-ipi-c3-metal-private-workflow.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/c3-metal/private/cucushift-installer-rehearse-gcp-ipi-c3-metal-private-workflow.yaml index adebcab842153..72d53735af322 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/c3-metal/private/cucushift-installer-rehearse-gcp-ipi-c3-metal-private-workflow.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/c3-metal/private/cucushift-installer-rehearse-gcp-ipi-c3-metal-private-workflow.yaml @@ -12,6 +12,6 @@ workflow: COMPUTE_NODE_REPLICAS: "2" COMPUTE_NODE_TYPE: "c3-highcpu-192-metal" CONFIDENTIAL_COMPUTE: "Disabled" - CONTROL_PLANE_NODE_TYPE: "n4-standard-4" + CONTROL_PLANE_NODE_TYPE: "n2-standard-4" ON_HOST_MAINTENANCE: "Terminate" documentation: "The IPI workflow provides provision- and deprovision- steps that provision and\ndeprovision an OpenShift private cluster with a default configuration \non GCP, allowing job authors to inject their own end-to-end test logic.\n\nAll modifications to this workflow should be done by modifying the\n`cucushift-installer-rehearse-gcp-ipi-c3-metal-private-{provision,deprovision}` \nchains to allow other workflows to mimic and extend this base workflow without \na need to backport changes." diff --git a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/nested-virtualization-osdisk-type-size/cucushift-installer-rehearse-gcp-ipi-nested-virtualization-osdisk-type-size-workflow.yaml b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/nested-virtualization-osdisk-type-size/cucushift-installer-rehearse-gcp-ipi-nested-virtualization-osdisk-type-size-workflow.yaml index 94b136239590c..96c7c8d6a6ec1 100644 --- a/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/nested-virtualization-osdisk-type-size/cucushift-installer-rehearse-gcp-ipi-nested-virtualization-osdisk-type-size-workflow.yaml +++ b/ci-operator/step-registry/cucushift/installer/rehearse/gcp/ipi/nested-virtualization-osdisk-type-size/cucushift-installer-rehearse-gcp-ipi-nested-virtualization-osdisk-type-size-workflow.yaml @@ -10,8 +10,8 @@ workflow: - ref: send-results-to-reportportal env: COMPUTE_NODE_REPLICAS: "2" - COMPUTE_NODE_TYPE: n4-standard-4 - CONTROL_PLANE_NODE_TYPE: n4-standard-4 + COMPUTE_NODE_TYPE: n2-standard-2 + CONTROL_PLANE_NODE_TYPE: n2-standard-4 DEFAULT_MACHINE_PLATFORM_DISK_SIZEGB: "256" DEFAULT_MACHINE_PLATFORM_DISK_TYPE: pd-balanced documentation: "The IPI workflow provides provision- and deprovision- steps that provision \nand deprovision an OpenShift with a default configuration on GCP, allowing \njob authors to inject their own end-to-end test logic.\n\nAll modifications to this workflow should be done by modifying the\n`cucushift-installer-rehearse-gcp-ipi-customer-vpc-{provision,deprovision}`\n chains to allow other workflows to mimic and extend this base workflow \n without a need to backport changes." diff --git a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh index a82179398b17f..953bf76df9100 100755 --- a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh +++ b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-commands.sh @@ -105,7 +105,7 @@ REGION="${LEASED_RESOURCE}" echo "Using region: ${REGION}" ZONE_0=$(gcloud compute regions describe ${REGION} --format=json | jq -r .zones[0] | cut -d "/" -f9) -MACHINE_TYPE="${BASTION_MACHINE_TYPE:-n4-standard-4}" +MACHINE_TYPE="${BASTION_MACHINE_TYPE:-n2-standard-2}" ##################################### ##########Create Bastion############# diff --git a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml index efd8a889b59c6..13e9c64597360 100644 --- a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml +++ b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml @@ -33,7 +33,7 @@ ref: default: "" documentation: |- The GCP machine type for the bastion host. If empty, defaults to - n4-standard-4. + n2-standard-2. - name: BASTION_IMAGE_NAME default: "" documentation: |- diff --git a/ci-operator/step-registry/openshift/e2e/cert-rotation/shutdown/openshift-e2e-cert-rotation-shutdown-workflow.yaml b/ci-operator/step-registry/openshift/e2e/cert-rotation/shutdown/openshift-e2e-cert-rotation-shutdown-workflow.yaml index 5a271151ea64e..80d4302f9ea39 100644 --- a/ci-operator/step-registry/openshift/e2e/cert-rotation/shutdown/openshift-e2e-cert-rotation-shutdown-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/cert-rotation/shutdown/openshift-e2e-cert-rotation-shutdown-workflow.yaml @@ -5,7 +5,7 @@ workflow: allow_best_effort_post_steps: true cluster_profile: gcp env: - MACHINE_TYPE: n4-highmem-16 + MACHINE_TYPE: n2-highmem-16 ASSISTED_CONFIG: | KUBE_API=true ENABLE_KUBE_API=true diff --git a/ci-operator/step-registry/openshift/e2e/cert-rotation/suspend/openshift-e2e-cert-rotation-suspend-workflow.yaml b/ci-operator/step-registry/openshift/e2e/cert-rotation/suspend/openshift-e2e-cert-rotation-suspend-workflow.yaml index 15a36291e6a1f..1b70c3f59197d 100644 --- a/ci-operator/step-registry/openshift/e2e/cert-rotation/suspend/openshift-e2e-cert-rotation-suspend-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/cert-rotation/suspend/openshift-e2e-cert-rotation-suspend-workflow.yaml @@ -5,7 +5,7 @@ workflow: allow_best_effort_post_steps: true cluster_profile: gcp env: - MACHINE_TYPE: n4-highmem-16 + MACHINE_TYPE: n2-highmem-16 ASSISTED_CONFIG: | KUBE_API=true ENABLE_KUBE_API=true diff --git a/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml b/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml index 2576c5dc1f583..2fd922770481d 100644 --- a/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/gcp/ovn-rt/openshift-e2e-gcp-ovn-rt-workflow.yaml @@ -20,6 +20,6 @@ workflow: env: FAIL_ON_CORE_DUMP: "false" RT_ENABLED: "true" - COMPUTE_NODE_TYPE: n4-standard-8 + COMPUTE_NODE_TYPE: n2-standard-8 documentation: |- The Openshift E2E OVN workflow with RHCOS10 diff --git a/ci-operator/step-registry/openshift/e2e/gcp/realtime/openshift-e2e-gcp-realtime-workflow.yaml b/ci-operator/step-registry/openshift/e2e/gcp/realtime/openshift-e2e-gcp-realtime-workflow.yaml index b388d2bc97928..6d0fe1133be1a 100644 --- a/ci-operator/step-registry/openshift/e2e/gcp/realtime/openshift-e2e-gcp-realtime-workflow.yaml +++ b/ci-operator/step-registry/openshift/e2e/gcp/realtime/openshift-e2e-gcp-realtime-workflow.yaml @@ -11,6 +11,6 @@ workflow: - chain: ipi-gcp-post env: RT_ENABLED: "true" - COMPUTE_NODE_TYPE: n4-standard-8 + COMPUTE_NODE_TYPE: n2-standard-8 documentation: |- The Openshift E2E GCP realtime workflow executes the common end-to-end test suite on GCP with realtime kernel workers. diff --git a/ci-operator/step-registry/openshift/upgrade/gcp/ovn-rt/openshift-upgrade-gcp-ovn-rt-workflow.yaml b/ci-operator/step-registry/openshift/upgrade/gcp/ovn-rt/openshift-upgrade-gcp-ovn-rt-workflow.yaml index 54279ffec15ec..7b4b7e324c954 100644 --- a/ci-operator/step-registry/openshift/upgrade/gcp/ovn-rt/openshift-upgrade-gcp-ovn-rt-workflow.yaml +++ b/ci-operator/step-registry/openshift/upgrade/gcp/ovn-rt/openshift-upgrade-gcp-ovn-rt-workflow.yaml @@ -23,7 +23,7 @@ workflow: TEST_SUITE: "" TEST_UPGRADE_OPTIONS: "" RT_ENABLED: "true" - COMPUTE_NODE_TYPE: n4-standard-8 + COMPUTE_NODE_TYPE: n2-standard-8 documentation: |- The Openshift E2E GCP OVN Realtime Kernel workflow executes the upgrade end-to-end test suite on GCP with a default cluster configuration and Loki as log collector, exercising an upgrade during the process. diff --git a/ci-operator/step-registry/single-node/conf/gcp/single-node-conf-gcp-commands.sh b/ci-operator/step-registry/single-node/conf/gcp/single-node-conf-gcp-commands.sh index 428fe57062d7d..4972f7209b815 100644 --- a/ci-operator/step-registry/single-node/conf/gcp/single-node-conf-gcp-commands.sh +++ b/ci-operator/step-registry/single-node/conf/gcp/single-node-conf-gcp-commands.sh @@ -4,7 +4,7 @@ set -o errexit set -o nounset set -o pipefail -SINGLE_NODE_GCP_INSTANCE_TYPE="n4-standard-16" +SINGLE_NODE_GCP_INSTANCE_TYPE="n2-standard-16" if [ "${OCP_ARCH}" = "arm64" ]; then SINGLE_NODE_GCP_INSTANCE_TYPE="t2a-standard-16" fi diff --git a/ci-operator/step-registry/upi/gcp/nested/pre/upi-gcp-nested-pre-ref.yaml b/ci-operator/step-registry/upi/gcp/nested/pre/upi-gcp-nested-pre-ref.yaml index 423005da1c8ea..b666c58a219d1 100644 --- a/ci-operator/step-registry/upi/gcp/nested/pre/upi-gcp-nested-pre-ref.yaml +++ b/ci-operator/step-registry/upi/gcp/nested/pre/upi-gcp-nested-pre-ref.yaml @@ -19,7 +19,7 @@ ref: - name: NSS_GROUPNAME default: packer - name: MACHINE_TYPE - default: n4-standard-16 + default: n2-standard-16 - name: CPU_PLATFORM default: "" - name: INSTANCE_IMAGE diff --git a/ci-operator/step-registry/upi/install/gcp/by-infra-manager/upi-install-gcp-by-infra-manager-ref.yaml b/ci-operator/step-registry/upi/install/gcp/by-infra-manager/upi-install-gcp-by-infra-manager-ref.yaml index bc77bbf3692c2..8af66814b1286 100644 --- a/ci-operator/step-registry/upi/install/gcp/by-infra-manager/upi-install-gcp-by-infra-manager-ref.yaml +++ b/ci-operator/step-registry/upi/install/gcp/by-infra-manager/upi-install-gcp-by-infra-manager-ref.yaml @@ -13,15 +13,15 @@ ref: documentation: |- The architecture of the control plane nodes (e.g., amd64, arm64) - name: CONTROL_PLANE_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-4" documentation: |- GCP machine type for control plane (master) nodes - name: COMPUTE_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-2" documentation: |- GCP machine type for worker (compute) nodes - name: BOOTSTRAP_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-4" documentation: |- GCP machine type for the temporary bootstrap node - name: PUBLISH diff --git a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh index 0de38b458a2bf..4058b44aa27b5 100755 --- a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh +++ b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-commands.sh @@ -619,19 +619,6 @@ else fi GATHER_BOOTSTRAP_ARGS=('--bootstrap' "${BOOTSTRAP_IP}") -## Select the appropriate boot disk type for a given machine type. -## N4-family instances (n4-, n4a-, n4d-) require hyperdisk-balanced; -## older families (n2-, e2-, etc.) use pd-ssd. -function boot_disk_type_for() { - local -r machine_type="$1" - case "${machine_type}" in - n4-*|n4a-*|n4d-*|c4-*|c4a-*|c4d-*|h4d-*|x4-*|m4-*|a4-*|a4x-*|g4-*) - echo "hyperdisk-balanced" ;; - *) - echo "pd-ssd" ;; - esac -} - function create_cluster_machines() { local -r machine_role="$1"; shift @@ -645,10 +632,9 @@ function create_cluster_machines() local -r deprovision_commands_file="$1"; shift local -r zones=("$@") local CMD index=0 - local -r disk_type="$(boot_disk_type_for "${node_type}")" for zone in "${zones[@]}"; do - CMD="gcloud compute instances create ${infra_id}-${machine_role}-${index} --boot-disk-size=${root_volume_size}GB --boot-disk-type=${disk_type} --image=${cluster_image} --metadata=^#^user-data='${ignition}' --machine-type=${node_type} --zone=${zone} --no-address --service-account=${service_account} --scopes=https://www.googleapis.com/auth/cloud-platform --tags=${infra_id}-${machine_role} --subnet=${machine_subnet}" + CMD="gcloud compute instances create ${infra_id}-${machine_role}-${index} --boot-disk-size=${root_volume_size}GB --boot-disk-type=pd-ssd --image=${cluster_image} --metadata=^#^user-data='${ignition}' --machine-type=${node_type} --zone=${zone} --no-address --service-account=${service_account} --scopes=https://www.googleapis.com/auth/cloud-platform --tags=${infra_id}-${machine_role} --subnet=${machine_subnet}" run_command "${CMD}" short_wait diff --git a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.yaml b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.yaml index 724e62282ab80..b4aa3398f5c1b 100644 --- a/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.yaml +++ b/ci-operator/step-registry/upi/install/gcp/upi-install-gcp-ref.yaml @@ -13,11 +13,11 @@ ref: documentation: |- The architecture of the control plane nodes (e.g., amd64, arm64) - name: CONTROL_PLANE_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-4" - name: COMPUTE_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-2" - name: BOOTSTRAP_NODE_TYPE - default: "n4-standard-4" + default: "n2-standard-4" - name: PUBLISH default: "" documentation: |- diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml index ebd5f0d867d5a..ca521cbb4d045 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml @@ -602,11 +602,11 @@ objects: elif [[ "${CLUSTER_TYPE}" == "gcp" ]]; then master_type=null if has_variant "xlarge"; then - master_type=n4-standard-32 + master_type=n2-standard-32 elif has_variant "large"; then - master_type=n4-standard-16 + master_type=n2-standard-16 elif has_variant "compact"; then - master_type=n4-standard-8 + master_type=n2-standard-8 fi # HACK: try to "poke" the token endpoint before the test starts for i in $(seq 1 30); do diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml index c4d37feef980f..c6e872a82f186 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml @@ -250,7 +250,7 @@ objects: gcloud compute instances create "${INSTANCE_PREFIX}" \ --image-family openshift4-libvirt \ --zone "${GOOGLE_COMPUTE_ZONE}" \ - --machine-type n4-standard-16 \ + --machine-type n2-standard-16 \ --min-cpu-platform "Intel Haswell" \ --boot-disk-type pd-ssd \ --boot-disk-size 256GB \ diff --git a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml index 08d14c59ecb9a..4ebe9f6ff5a86 100644 --- a/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml +++ b/ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml @@ -434,11 +434,11 @@ objects: elif [[ "${CLUSTER_TYPE}" == "gcp" ]]; then master_type=null if has_variant "xlarge"; then - master_type=n4-standard-32 + master_type=n2-standard-32 elif has_variant "large"; then - master_type=n4-standard-16 + master_type=n2-standard-16 elif has_variant "compact"; then - master_type=n4-standard-8 + master_type=n2-standard-8 fi # HACK: try to "poke" the token endpoint before the test starts for i in $(seq 1 30); do