Skip to content

OCPBUGS-85346: Revert 4.22 and 4.23 from C4A to T2A instances to avoid hyperdisk costs #79056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
barbacbd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-85346: Revert 4.22 and 4.23 from C4A to T2A instances to avoid hyperdisk costs #79056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-nightly-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .../openshift/multiarch/openshift-multiarch-main__nightly-4.22-upgrade-from-stable-4.21.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 10 additions & 12 deletions ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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\|
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-nightly-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .../openshift/multiarch/openshift-multiarch-main__nightly-4.23-upgrade-from-stable-4.22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 10 additions & 12 deletions ci-operator/config/openshift/multiarch/openshift-multiarch-main__nightly-4.23.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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\|
Expand Down Expand Up @@ -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
Expand Down