[integ-tests] Reduce timeout limit

The boot speed of Rocky and RHEL were improved after aws/aws-parallelcluster-cookbook#2920

Signed-off-by: Hanwen <[email protected]>

Author: hanwen-cluster

tests/integration-tests/tests/common/hit_common.py

@@ -85,9 +85,7 @@ def assert_compute_node_reasons(scheduler_commands, compute_nodes, expected_reas
         assert_that(node_info).contains(f"Reason={expected_reason}")
 
 
-# TOFIX We observe in 3.13.0 an increase in the bootstrap time for Rocky and RHEL.
-# We must address it and restore the default wait time to 5 minutes.
-@retry(wait_fixed=seconds(20), stop_max_delay=minutes(7))
+@retry(wait_fixed=seconds(20), stop_max_delay=minutes(5))
 def wait_for_num_nodes_in_scheduler(scheduler_commands, desired, filter_by_partition=None):
     assert_num_nodes_in_scheduler(scheduler_commands, desired, filter_by_partition)
 

tests/integration-tests/tests/schedulers/test_slurm.py

@@ -257,9 +257,7 @@ def test_slurm_scaling(
     cluster = clusters_factory(cluster_config)
     remote_command_executor = RemoteCommandExecutor(cluster)
     scheduler_commands = scheduler_commands_factory(remote_command_executor)
-    # TOFIX We observe in 3.13.0 an increase in the bootstrap time for Rocky and RHEL.
-    # We must address it and restore the default wait time to 300s.
-    stop_max_delay_secs = 400 if (os.startswith("rocky") or os.startswith("rhel")) else 300
+    stop_max_delay_secs = 300
 
     _assert_cluster_initial_conditions(scheduler_commands, 20, 20, 4)
     _test_online_node_configured_correctly(