cheest_CTS_P: Increase the timeout for CtsActivityManagerDevice
For some reason, 2-ABI test (x86) takes 6 times longer than 1-ABI test (arm).
Giving it extra 1 hour to make it stabily pass, until the root cause is fixed.
BUG=b:147933489
TEST=the test itself
Change-Id: I2daa0368576a7a2d126e2f8c7f254a1a287410a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2008912
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org>
(cherry picked from commit 25e308a177ff646a84067d263cf4ea115b29b8e0)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2008914
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index f7b6116..8395958 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -46,7 +46,7 @@
# Timeout in hours.
CONFIG['CTS_TIMEOUT'] = {
- 'CtsActivityManagerDeviceTestCases': 1.5,
+ 'CtsActivityManagerDeviceTestCases': 2.0,
'CtsAppSecurityHostTestCases': 2.0,
'CtsAutoFillServiceTestCases': 2.5, # TODO(b/134662826)
'CtsDeqpTestCases': 20.0,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
index 6e2cd45..8ed0571 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsActivityManagerDevice
@@ -28,6 +28,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
- timeout=9000)
+ timeout=10800)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
index 99bbe15..f4b702b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsActivityManagerDevice
@@ -28,6 +28,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
- timeout=9000)
+ timeout=10800)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
index 4785a4e..d718771 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
@@ -30,6 +30,6 @@
bundle='arm',
retry_manual_tests=True,
warn_on_test_retry=False,
- timeout=5400)
+ timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
index 782a7f9..89236db 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
@@ -30,6 +30,6 @@
bundle='x86',
retry_manual_tests=True,
warn_on_test_retry=False,
- timeout=5400)
+ timeout=7200)
parallel_simple(run_TS, machines)
