Fix region name and missing fixture os

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

Author: lukeseawalker

tests/integration-tests/tests/storage/test_ebs.py

@@ -20,7 +20,7 @@
 from tests.storage.storage_common import verify_directory_correctly_shared
 
 
-@pytest.mark.regions(["us-west-3", "cn-north-1", "us-gov-west-1"])
+@pytest.mark.regions(["eu-west-3", "cn-north-1", "us-gov-west-1"])
 @pytest.mark.instances(["c4.xlarge", "c5.xlarge"])
 @pytest.mark.schedulers(["sge"])
 @pytest.mark.usefixtures("region", "os", "instance")
@@ -40,7 +40,7 @@ def test_ebs_single(scheduler, pcluster_config_reader, clusters_factory):
 @pytest.mark.instances(["c5.xlarge"])  # Test on EBS-Only and NVMe instances
 @pytest.mark.schedulers(["sge"])
 @pytest.mark.oss(["alinux2"])  # centos6 does not support GPT
-@pytest.mark.usefixtures("instance")
+@pytest.mark.usefixtures("os", "instance")
 def test_ebs_snapshot(
     request, vpc_stacks, region, scheduler, pcluster_config_reader, clusters_factory, snapshots_factory
 ):
@@ -73,7 +73,7 @@ def test_ebs_snapshot(
 @pytest.mark.instances(["c5.xlarge"])
 @pytest.mark.schedulers(["slurm", "awsbatch"])
 @pytest.mark.oss(["ubuntu1804"])
-@pytest.mark.usefixtures("region", "instance")
+@pytest.mark.usefixtures("region", "os", "instance")
 def test_ebs_multiple(scheduler, pcluster_config_reader, clusters_factory):
     mount_dirs = ["/ebs_mount_dir_{0}".format(i) for i in range(0, 5)]
     volume_sizes = [15 + 5 * i for i in range(0, 5)]
@@ -91,7 +91,7 @@ def test_ebs_multiple(scheduler, pcluster_config_reader, clusters_factory):
 @pytest.mark.instances(["c4.xlarge"])
 @pytest.mark.schedulers(["slurm"])
 @pytest.mark.oss(["alinux"])
-@pytest.mark.usefixtures("region", "instance")
+@pytest.mark.usefixtures("region", "os", "instance")
 def test_default_ebs(scheduler, pcluster_config_reader, clusters_factory):
     cluster_config = pcluster_config_reader()
     cluster = clusters_factory(cluster_config)
@@ -107,7 +107,7 @@ def test_default_ebs(scheduler, pcluster_config_reader, clusters_factory):
 @pytest.mark.instances(["c5.xlarge"])
 @pytest.mark.schedulers(["torque"])
 @pytest.mark.oss(["ubuntu1604"])
-@pytest.mark.usefixtures("region", "instance")
+@pytest.mark.usefixtures("region", "os", "instance")
 def test_ebs_single_empty(scheduler, pcluster_config_reader, clusters_factory):
     cluster_config = pcluster_config_reader()
     cluster = clusters_factory(cluster_config)

tests/integration-tests/tests/storage/test_raid.py

@@ -39,7 +39,7 @@ def test_raid_performance_mode(scheduler, pcluster_config_reader, clusters_facto
 @pytest.mark.instances(["c5.xlarge"])
 @pytest.mark.schedulers(["slurm"])
 @pytest.mark.oss(["alinux2"])
-@pytest.mark.usefixtures("region", "instance")
+@pytest.mark.usefixtures("region", "os", "instance")
 def test_raid_fault_tolerance_mode(scheduler, pcluster_config_reader, clusters_factory):
     cluster_config = pcluster_config_reader()
     cluster = clusters_factory(cluster_config)