[Test] Make test_job_level_scaling head node instance type architectu…

…re agnostic The test is run both with x86 and ARM Signed-off-by: Hanwen <[email protected]>
aws · Dec 23, 2024 · 60e2e3d · 60e2e3d
1 parent 925153c
commit 60e2e3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tests/integration-tests/tests/scaling/test_scaling.py b/tests/integration-tests/tests/scaling/test_scaling.py
@@ -28,7 +28,7 @@
 from tests.schedulers.test_slurm import _assert_job_state
 
 
-@pytest.mark.usefixtures("os", "instance")
+@pytest.mark.usefixtures("os")
 @pytest.mark.parametrize(
     "scaling_strategy, scaling_behaviour_by_capacity",
     [
@@ -185,6 +185,7 @@
 )
 def test_job_level_scaling(
     region,
+    instance,
     pcluster_config_reader,
     clusters_factory,
     scheduler_commands_factory,
@@ -201,6 +202,7 @@ def test_job_level_scaling(
         scaledown_idletime=scaledown_idletime,
         scaling_strategy=scaling_strategy,
         no_of_queues=no_of_queues,
+        head_node_instance_type=instance.replace(".xlarge", ".2xlarge"),
     )
     cluster = clusters_factory(cluster_config)
     remote_command_executor = RemoteCommandExecutor(cluster)

diff --git a/.../integration-tests/tests/scaling/test_scaling/test_job_level_scaling/pcluster.config.yaml b/.../integration-tests/tests/scaling/test_scaling/test_job_level_scaling/pcluster.config.yaml
@@ -1,7 +1,7 @@
 Image:
   Os: {{ os }}
 HeadNode:
-  InstanceType: "c5.2xlarge"
+  InstanceType: {{ head_node_instance_type }}
   Networking:
     SubnetId: {{ public_subnet_id }}
   Ssh: