Increase Batch test timeouts in china partition

Signed-off-by: Tim Lane <[email protected]>

Author: Tim Lane

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

@@ -26,7 +26,7 @@
 @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, caplog):
+def test_awsbatch(pcluster_config_reader, clusters_factory, test_datadir, caplog, region):
     """
     Test all AWS Batch related features.
 
@@ -38,33 +38,34 @@ def test_awsbatch(pcluster_config_reader, clusters_factory, test_datadir, caplog
     _assert_compute_instance_type_validation_successful(caplog)
     remote_command_executor = RemoteCommandExecutor(cluster)
 
-    _test_simple_job_submission(remote_command_executor, test_datadir)
+    timeout = 120 if region.startswith("cn-") else 60  # Longer timeout in china regions due to less reliable networking
+    _test_simple_job_submission(remote_command_executor, test_datadir, timeout)
     _test_array_submission(remote_command_executor)
     _test_mnp_submission(remote_command_executor, test_datadir)
-    _test_job_kill(remote_command_executor)
+    _test_job_kill(remote_command_executor, timeout)
 
 
-def _test_simple_job_submission(remote_command_executor, test_datadir):
+def _test_simple_job_submission(remote_command_executor, test_datadir, timeout):
     logging.info("Testing inline submission.")
-    _test_job_submission(remote_command_executor, "awsbsub --vcpus 2 --memory 256 --timeout 60 sleep 1")
+    _test_job_submission(remote_command_executor, f"awsbsub --vcpus 2 --memory 256 --timeout {timeout} sleep 1")
 
     # FIXME: uncomment once this bug is fixed
     # logging.info("Testing inline submission with env.")
     # _test_job_submission(
     #     remote_command_executor,
-    #     'export TEST=test && awsbsub --vcpus 2 --memory 256 --timeout 60 -e TEST "env | grep TEST=test"',
+    #     f'export TEST=test && awsbsub --vcpus 2 --memory 256 --timeout {timeout} -e TEST "env | grep TEST=test"',
     # )
 
     logging.info("Testing stdin submission with env")
     _test_job_submission(
         remote_command_executor,
-        'export TEST=test && echo "env | grep TEST=test" | awsbsub --vcpus 2 --memory 256 --timeout 60 -e TEST',
+        f'export TEST=test && echo "env | grep TEST=test" | awsbsub --vcpus 2 --memory 256 --timeout {timeout} -e TEST',
     )
 
     logging.info("Testing command file with env")
     _test_job_submission(
         remote_command_executor,
-        "export TEST=test && awsbsub --vcpus 2 --memory 256 --timeout 60 -e TEST -cf test_simple_job.sh",
+        f"export TEST=test && awsbsub --vcpus 2 --memory 256 --timeout {timeout} -e TEST -cf test_simple_job.sh",
         [str(test_datadir / "test_simple_job.sh")],
     )
 
@@ -84,10 +85,10 @@ def _test_mnp_submission(remote_command_executor, test_datadir):
     )
 
 
-def _test_job_kill(remote_command_executor):
+def _test_job_kill(remote_command_executor, timeout):
     logging.info("Testing job kill.")
     awsbatch_commands = AWSBatchCommands(remote_command_executor)
-    result = remote_command_executor.run_remote_command("awsbsub --vcpus 2 --memory 256 --timeout 60 sleep 300")
+    result = remote_command_executor.run_remote_command(f"awsbsub --vcpus 2 --memory 256 --timeout {timeout} sleep 300")
     job_id = awsbatch_commands.assert_job_submitted(result.stdout)
 
     remote_command_executor.run_remote_command("awsbkill {0}".format(job_id))