autotest: Add runtime timeout to network3g test suites.
BUG=chromium:389628
TEST=Observe wmatrix to ensure suites remain sane.
Change-Id: I544b12bc69f03d33800d6c542d7af42dc90cbb21
Reviewed-on: https://chromium-review.googlesource.com/206017
Reviewed-by: Thieu Le <thieule@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/test_suites/control.network3g b/test_suites/control.network3g
index e7f5b56..a14a342 100644
--- a/test_suites/control.network3g
+++ b/test_suites/control.network3g
@@ -42,8 +42,8 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
- suite_dependencies='modem_repair',
+ file_bugs=file_bugs, max_runtime_mins=20, priority=priority,
+ timeout_mins=timeout_mins, suite_dependencies='modem_repair',
bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
version_prefix=provision.CROS_VERSION_PREFIX,
wait_for_results=wait_for_results, job_retry=job_retry)
diff --git a/test_suites/control.network3g_att b/test_suites/control.network3g_att
index be60f51..028707c 100644
--- a/test_suites/control.network3g_att
+++ b/test_suites/control.network3g_att
@@ -40,7 +40,7 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_att', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority,
+ file_bugs=file_bugs, max_runtime_mins=20, priority=priority,
bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
suite_dependencies='carrier:att,modem_repair', timeout_mins=timeout_mins,
version_prefix=provision.CROS_VERSION_PREFIX,
diff --git a/test_suites/control.network3g_gobi b/test_suites/control.network3g_gobi
index e95e9a9..c1afc35 100644
--- a/test_suites/control.network3g_gobi
+++ b/test_suites/control.network3g_gobi
@@ -42,8 +42,8 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_gobi', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
- bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
- suite_dependencies='modem_repair',
+ file_bugs=file_bugs, max_runtime_mins=20, priority=priority,
+ timeout_mins=timeout_mins, bug_template=_BUG_TEMPLATE,
+ devserver_url=devserver_url, suite_dependencies='modem_repair',
version_prefix=provision.CROS_VERSION_PREFIX,
wait_for_results=wait_for_results, job_retry=job_retry)
diff --git a/test_suites/control.network3g_pseudomodem b/test_suites/control.network3g_pseudomodem
index 24278ce..08ea8fa 100644
--- a/test_suites/control.network3g_pseudomodem
+++ b/test_suites/control.network3g_pseudomodem
@@ -46,7 +46,7 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_pseudomodem', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
- bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
- version_prefix=provision.CROS_VERSION_PREFIX,
+ file_bugs=file_bugs, max_runtime_mins=10, priority=priority,
+ timeout_mins=timeout_mins, bug_template=_BUG_TEMPLATE,
+ devserver_url=devserver_url, version_prefix=provision.CROS_VERSION_PREFIX,
wait_for_results=wait_for_results, job_retry=job_retry)
diff --git a/test_suites/control.network3g_tmobile b/test_suites/control.network3g_tmobile
index 744c3bb..9ff235a 100644
--- a/test_suites/control.network3g_tmobile
+++ b/test_suites/control.network3g_tmobile
@@ -42,7 +42,7 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_tmobile', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority,
+ file_bugs=file_bugs, max_runtime_mins=20, priority=priority,
bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
suite_dependencies='carrier:tmobile,modem_repair',
timeout_mins=timeout_mins,
diff --git a/test_suites/control.network3g_verizon b/test_suites/control.network3g_verizon
index a58c895..c6929aa 100644
--- a/test_suites/control.network3g_verizon
+++ b/test_suites/control.network3g_verizon
@@ -42,7 +42,7 @@
dynamic_suite.reimage_and_run(
build=build, board=board, name='network3g_verizon', job=job, pool=pool,
check_hosts=check_hosts, add_experimental=True, num=num,
- file_bugs=file_bugs, priority=priority,
+ file_bugs=file_bugs, max_runtime_mins=20, priority=priority,
bug_template=_BUG_TEMPLATE, devserver_url=devserver_url,
suite_dependencies='carrier:verizon,modem_repair',
timeout_mins=timeout_mins,