[integ-test] Remove old generation of instance types

Signed-off-by: Hanwen <[email protected]>
hanwen-pcluste · Oct 18, 2024 · 6996bb2 · 6996bb2
1 parent 25e384c
commit 6996bb2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/tests/integration-tests/README.md b/tests/integration-tests/README.md
@@ -493,13 +493,13 @@ Here is how to define a simple parametrized test case:
 def test_case_1(region, instance, os, scheduler):
 ```
 This test case will be automatically parametrized and executed for all combination of input dimensions.
-For example, given as input dimensions `--regions "eu-west-1" --instances "c4.xlarge" --oss "alinux2"
+For example, given as input dimensions `--regions "eu-west-1" --instances "c5.xlarge" --oss "alinux2"
 "ubuntu1804" --scheduler "awsbatch" "slurm"`, the following tests will run:
 ```
-test_case_1[eu-west-1-c4.xlarge-alinux2-awsbatch]
-test_case_1[eu-west-1-c4.xlarge-ubuntu1804-awsbatch]
-test_case_1[eu-west-1-c4.xlarge-alinux2-slurm]
-test_case_1[eu-west-1-c4.xlarge-ubuntu1804-slurm]
+test_case_1[eu-west-1-c5.xlarge-alinux2-awsbatch]
+test_case_1[eu-west-1-c5.xlarge-ubuntu1804-awsbatch]
+test_case_1[eu-west-1-c5.xlarge-alinux2-slurm]
+test_case_1[eu-west-1-c5.xlarge-ubuntu1804-slurm]
 ```
 
 If you don't need to reference the parametrized arguments in your test case you can simply replace the
@@ -558,13 +558,13 @@ While the following test case:
 ```python
 @pytest.mark.skip_regions(["us-east-1", "eu-west-1"])
 @pytest.mark.skip_dimensions("*", "c5.xlarge", "alinux2", "awsbatch")
-@pytest.mark.skip_dimensions("*", "c4.xlarge", "centos7", "slurm")
+@pytest.mark.skip_dimensions("*", "c5.xlarge", "centos7", "slurm")
 def test_case_2(region, instance, os, scheduler):
 ```
 is allowed to run only if:
 * region is not `["us-east-1", "eu-west-1"]`
 * the triplet (instance, os, scheduler) is not `("c5.xlarge", "alinux2", "awsbatch")` or
-`("c4.xlarge", "ubuntu2004", "slurm")`
+`("c5.xlarge", "ubuntu2004", "slurm")`
 
 #### Default Invalid Dimensions
 

diff --git a/tests/integration-tests/configs/common.jinja2 b/tests/integration-tests/configs/common.jinja2
@@ -16,7 +16,7 @@
 {%- set INSTANCES_DEFAULT_ARM = ["m6g.xlarge"] -%} # m6g.xlarge is not supported in af-south-1, eu-south-1, eu-west-3, me-south-1
 {%- set INSTANCES_DEFAULT = ["c5.xlarge", "m6g.xlarge"] -%}
 {%- set INSTANCES_EFA_SUPPORTED_X86 = ["c5n.9xlarge"] -%}
-{%- set INSTANCES_EFA_UNSUPPORTED_X86 = ["t2.micro"] -%}
+{%- set INSTANCES_EFA_UNSUPPORTED_X86 = ["t3.micro"] -%}
 {%- set NOT_RELEASED_OSES = ["rocky8", "rocky9"] -%}
 
 {%- macro instance(instance_key) -%}

diff --git a/tests/integration-tests/configs/new_os.yaml b/tests/integration-tests/configs/new_os.yaml
@@ -226,7 +226,7 @@ test-suites:
     test_ephemeral.py::test_head_node_stop:
       dimensions:
         - regions: ["use1-az4"]
-          instances: ["m5d.xlarge", "d2.2xlarge"]
+          instances: ["m5d.xlarge"]
           oss: {{ NEW_OS }}
           schedulers: ["slurm"]
   update:

diff --git a/tests/integration-tests/conftest_networking.py b/tests/integration-tests/conftest_networking.py
@@ -38,12 +38,8 @@
     "ap-southeast-2": ["apse2-az1", "apse2-az2"],
     # FSx for Luster is not supported in apne1-az1
     "ap-northeast-1": ["apne1-az4", "apne1-az2"],
-    # c4.xlarge is not supported in apne2-az2
-    "ap-northeast-2": ["apne2-az1", "apne2-az3"],
     # c5.xlarge is not supported in apse1-az3
     "ap-southeast-1": ["apse1-az2", "apse1-az1"],
-    # c4.xlarge is not supported in aps1-az2
-    "ap-south-1": ["aps1-az1", "aps1-az3"],
     # NAT Gateway not available in sae1-az2 , c5n.18xlarge is not supported in sae1-az3
     "sa-east-1": ["sae1-az1"],
     # m6g.xlarge instances not available in euw1-az3

diff --git a/tests/integration-tests/tests/schedulers/test_awsbatch/test_awsbatch/pcluster.config.yaml b/tests/integration-tests/tests/schedulers/test_awsbatch/test_awsbatch/pcluster.config.yaml
@@ -19,7 +19,7 @@ Scheduling:
         - Name: compute-resource-11
           InstanceTypes:
             - {{ instance }}
-          # we usually use c4.xlarge and c5.xlarge for test, the min vcpus for one instance is 4.
+          # we usually use c5.xlarge for test, the min vcpus for one instance is 4.
           MinvCpus: 4
           DesiredvCpus: 8
           MaxvCpus: 64