USHIFT-3324: Use c7* instances in all jobs (#52875)

* USHIFT-3324: Use c7i.2xlarge as new default instance type * USHIFT-3324: Use c7g instead of t4g instances
openshift · Jun 6, 2024 · adad014 · adad014
1 parent 89efc44
commit adad014
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml
@@ -109,15 +109,15 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: microshift-metal-cache-nightly-arm
   cron: 0 0 * * *
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: rebase-on-nightlies
@@ -212,15 +212,15 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: ocp-conformance-with-optional-rpms-rhel-eus-nightly-arm
   cron: 30 8 * * *
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
       OPTIONAL_RPMS: "true"
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
@@ -236,7 +236,7 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: e2e-aws-ovn-ocp-conformance

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.15.yaml
@@ -108,15 +108,15 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.3
     workflow: openshift-microshift-e2e-metal-cache
 - as: microshift-metal-cache-nightly-arm
   cron: 0 1 * * *
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.3
     workflow: openshift-microshift-e2e-metal-cache
 - as: rebase-on-nightlies
@@ -165,7 +165,7 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: ocp-conformance-rhel-eus
   run_if_changed: ^(assets/.*|cmd/.*|etcd/.*|pkg/.*|packaging/.*|origin/.*|vendor/.*|Makefile.*|scripts/.*)$
@@ -177,7 +177,7 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: clusterbot
   cron: 0 2 * * *

diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-release-4.16.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-release-4.16.yaml
@@ -109,15 +109,15 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: microshift-metal-cache-nightly-arm
   cron: 30 0 * * *
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-metal-cache
 - as: rebase-on-nightlies
@@ -180,15 +180,15 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: ocp-conformance-with-optional-rpms-rhel-eus-nightly-arm
   cron: 30 10 * * *
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
       OPTIONAL_RPMS: "true"
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
@@ -204,7 +204,7 @@ tests:
   steps:
     cluster_profile: aws
     env:
-      EC2_INSTANCE_TYPE: t4g.2xlarge
+      EC2_INSTANCE_TYPE: c7g.2xlarge
       MICROSHIFT_OS: rhel-9.4
     workflow: openshift-microshift-e2e-openshift-conformance-build-and-run
 - as: e2e-aws-ovn-ocp-conformance

diff --git a/...p-registry/openshift/microshift/infra/aws/ec2/openshift-microshift-infra-aws-ec2-ref.yaml b/...p-registry/openshift/microshift/infra/aws/ec2/openshift-microshift-infra-aws-ec2-ref.yaml
@@ -13,7 +13,7 @@ ref:
     documentation: |-
       BYO AMI for EC2
   - name: EC2_INSTANCE_TYPE
-    default: t3.2xlarge
+    default: c7i.2xlarge
   - name: EC2_REGION
     default: us-west-2
   - name: MICROSHIFT_OS