Restore ebs test for awsbatch case

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

Author: lukeseawalker

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

@@ -36,10 +36,9 @@ def test_ebs_single(scheduler, pcluster_config_reader, clusters_factory):
     _test_ebs_correctly_shared(remote_command_executor, mount_dir, scheduler_commands)
 
 
-@pytest.mark.regions(["ap-northeast-2"])
-@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
+# centos6 does not support GPT
+@pytest.mark.dimensions("ap-northeast-2", "c5.xlarge", "alinux2", "sge")
+@pytest.mark.dimensions("cn-northwest-1", "c4.xlarge", "ubuntu1804", "slurm")
 @pytest.mark.usefixtures("os", "instance")
 def test_ebs_snapshot(
     request, vpc_stacks, region, scheduler, pcluster_config_reader, clusters_factory, snapshots_factory
@@ -69,10 +68,8 @@ def test_ebs_snapshot(
 
 
 # cn-north-1 does not support KMS
-@pytest.mark.regions(["ca-central-1"])
-@pytest.mark.instances(["c5.xlarge"])
-@pytest.mark.schedulers(["slurm", "awsbatch"])
-@pytest.mark.oss(["ubuntu1804"])
+@pytest.mark.dimensions("ca-central-1", "c5.xlarge", "alinux2", "awsbatch")
+@pytest.mark.dimensions("ca-central-1", "c5.xlarge", "ubuntu1804", "slurm")
 @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)]
@@ -87,10 +84,7 @@ def test_ebs_multiple(scheduler, pcluster_config_reader, clusters_factory):
         _test_ebs_correctly_shared(remote_command_executor, mount_dir, scheduler_commands)
 
 
-@pytest.mark.regions(["cn-northwest-1"])
-@pytest.mark.instances(["c4.xlarge"])
-@pytest.mark.schedulers(["slurm"])
-@pytest.mark.oss(["alinux"])
+@pytest.mark.dimensions("cn-northwest-1", "c4.xlarge", "alinux", "slurm")
 @pytest.mark.usefixtures("region", "os", "instance")
 def test_default_ebs(scheduler, pcluster_config_reader, clusters_factory):
     cluster_config = pcluster_config_reader()
@@ -103,10 +97,7 @@ def test_default_ebs(scheduler, pcluster_config_reader, clusters_factory):
     _test_ebs_correctly_shared(remote_command_executor, mount_dir, scheduler_commands)
 
 
-@pytest.mark.regions(["us-gov-east-1"])
-@pytest.mark.instances(["c5.xlarge"])
-@pytest.mark.schedulers(["torque"])
-@pytest.mark.oss(["ubuntu1604"])
+@pytest.mark.dimensions("us-gov-east-1", "c5.xlarge", "ubuntu1604", "torque")
 @pytest.mark.usefixtures("region", "os", "instance")
 def test_ebs_single_empty(scheduler, pcluster_config_reader, clusters_factory):
     cluster_config = pcluster_config_reader()