Reduce the number of tests and re-balance them across regions (part 2)

Signed-off-by: Luca Carrogu <[email protected]>

Author: lukeseawalker

tests/integration-tests/tests/cloudwatch_logging/test_cloudwatch_logging.py

@@ -583,9 +583,9 @@ def get_config_param_vals():
 
 # In order to limit the number of CloudWatch logging tests while still covering all the OSes...
 # 1) run the test for all of the schedulers with alinux2
-@pytest.mark.dimensions("eu-west-1", "c5.xlarge", "alinux2", "*")
+@pytest.mark.dimensions("ca-central-1", "c5.xlarge", "alinux2", "*")
 # 2) run the test for all of the OSes with slurm
-@pytest.mark.dimensions("eu-west-1", "c5.xlarge", "*", "slurm")
+@pytest.mark.dimensions("ap-east-1", "c5.xlarge", "*", "slurm")
 # 3) run the test for a single scheduler-OS combination on an ARM instance
 @pytest.mark.dimensions("eu-west-1", "m6g.xlarge", "alinux2", "slurm")
 def test_cloudwatch_logging(region, scheduler, instance, os, pcluster_config_reader, clusters_factory):

tests/integration-tests/tests/dns/test_dns.py

@@ -20,7 +20,7 @@
 from tests.common.utils import fetch_instance_slots
 
 
-@pytest.mark.regions(["eu-west-1"])
+@pytest.mark.regions(["eu-west-2"])
 @pytest.mark.instances(["c5.xlarge"])
 @pytest.mark.schedulers(["slurm"])
 def test_hit_no_cluster_dns_mpi(

tests/integration-tests/tests/schedulers/test_awsbatch.py

@@ -20,9 +20,11 @@
 
 @pytest.mark.batch_dockerfile_deps
 @pytest.mark.skip_regions(["ap-northeast-3", "us-gov-east-1", "us-gov-west-1"])
-@pytest.mark.instances(["c5.xlarge", "t2.large", "m6g.xlarge"])
-@pytest.mark.dimensions("*", "*", "alinux", "awsbatch")
-@pytest.mark.dimensions("*", "*", "alinux2", "awsbatch")
+@pytest.mark.instances(["c5.xlarge", "c4.xlarge", "m6g.xlarge"])
+@pytest.mark.dimensions("*", "c5.xlarge", "alinux2", "awsbatch")
+@pytest.mark.dimensions("cn-north-1", "c4.xlarge", "alinux2", "awsbatch")
+@pytest.mark.dimensions("ap-southeast-1", "c5.xlarge", "alinux", "awsbatch")
+@pytest.mark.dimensions("ap-northeast-1", "m6g.xlarge", "alinux2", "awsbatch")
 @pytest.mark.usefixtures("region", "os", "instance", "scheduler")
 def test_awsbatch(pcluster_config_reader, clusters_factory, test_datadir):
     """