diff --git a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml index 034cf0c39939..66fd8c6aac39 100644 --- a/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml +++ b/ci-operator/config/openshift/microshift/openshift-microshift-main.yaml @@ -109,7 +109,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-metal-cache - as: microshift-metal-cache-nightly-arm @@ -117,7 +117,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-metal-cache - as: rebase-on-nightlies @@ -212,7 +212,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: ocp-conformance-with-optional-rpms-rhel-eus-nightly-arm @@ -220,7 +220,7 @@ tests: 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 index db23568ec74a..a7c6f448cc41 100644 --- 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,7 +108,7 @@ 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 @@ -116,7 +116,7 @@ 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: 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 index cb0559cd0c4b..06ebc43e5880 100644 --- 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,7 +109,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-metal-cache - as: microshift-metal-cache-nightly-arm @@ -117,7 +117,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-metal-cache - as: rebase-on-nightlies @@ -180,7 +180,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: ocp-conformance-with-optional-rpms-rhel-eus-nightly-arm @@ -188,7 +188,7 @@ tests: 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/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/openshift-microshift-infra-aws-ec2-ref.yaml b/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/openshift-microshift-infra-aws-ec2-ref.yaml index 21757293e5bb..dc65726fa719 100644 --- a/ci-operator/step-registry/openshift/microshift/infra/aws/ec2/openshift-microshift-infra-aws-ec2-ref.yaml +++ b/ci-operator/step-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