cheets_CTS_P: Update the timelimits.
The current limit was determined during the bring up phase of ARC-P
when the tests were far less stable. Besides, slower devices are
upgrading to P, hence some test now takes naturally more time than
before.
The new data reflects data from recent 2 weeks.
BUG=b:134630907
TEST=none
Change-Id: I43e738f4fe43ce7710080095e0f94e3cbcb12278
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1776521
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit 59e9d0b5dea20af32b82b99e6edd1a4b9abaf3e3)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1779766
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAccessibility
index 3fc2c08..e8e532c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAccessibility
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=14400)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsActivityManagerDevice
index e9bee48..9c19eb1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsActivityManagerDevice
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=14400)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsApp
index 56df55c..cd2617d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsApp
@@ -31,6 +31,6 @@
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
- timeout=14400)
+ timeout=10800)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAutoFillServiceTestCases
index 0175a26..10c4f10 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsAutoFillServiceTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=3600)
+ timeout=9000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDeqpTestCases
index da7dedc..7141361 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDeqpTestCases
@@ -30,6 +30,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=108000)
+ timeout=72000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDevice
index bad9f70..55a5621 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsDevice
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=10800)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsFileSystemTestCases
index faa2d99..ca8c3da 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsFileSystemTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=9000)
+ timeout=10800)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsHardwareTestCases
index 2dcba99..23fbe29 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsHardwareTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=10800)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsLibcore
index 982769a..e38f1b0 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsLibcore
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=23400)
+ timeout=21600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaBitstreamsTestCases
index 6082a72..a089b25 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaBitstreamsTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=57600)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaStressTestCases
index bb4e0df..c8a673c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaStressTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=57600)
+ timeout=18000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaTestCases
index 475b2b7..3e4a417 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsMediaTestCases
@@ -30,6 +30,6 @@
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
- timeout=57600)
+ timeout=36000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsPrintTestCases
index 77c5d94..8e1393e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsPrintTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=10800)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSecurity
index f9f8491..2c2e737 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSecurity
@@ -30,6 +30,6 @@
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
- timeout=16200)
+ timeout=12600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSensorTestCases
index d4859b8..0b8f4e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsSensorTestCases
@@ -30,6 +30,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=10800)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsShortcut
index 9b9ceb9..54754f3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsShortcut
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=9000)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsTheme
index abd15f5..08df7a9 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsTheme
@@ -30,6 +30,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=25200)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsWidgetTestCases
index 757ba05..5a68d85 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.CtsWidgetTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=7200)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.tradefed-run-collect-tests-only-internal
index 8f919d3..d793cc8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.tradefed-run-collect-tests-only-internal
@@ -30,6 +30,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=7200)
+ timeout=9000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.vm-tests-tf
index 063ce11..d0ab500 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.arm.vm-tests-tf
@@ -29,6 +29,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-arm.zip',
- timeout=7200)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAccessibility b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAccessibility
index 7d2778c..615e04f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAccessibility
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAccessibility
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=14400)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsActivityManagerDevice b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsActivityManagerDevice
index e663428..13b3458 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsActivityManagerDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsActivityManagerDevice
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=14400)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsApp b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsApp
index 1a314ef..7ff69f7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsApp
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsApp
@@ -31,6 +31,6 @@
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
- timeout=14400)
+ timeout=10800)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAutoFillServiceTestCases
index eedba5e..d081b34 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsAutoFillServiceTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=3600)
+ timeout=9000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDeqpTestCases
index 207dce8..4d73f62 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDeqpTestCases
@@ -30,6 +30,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=108000)
+ timeout=72000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDevice b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDevice
index 0cfa3f3..1edff61 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDevice
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsDevice
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=10800)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsFileSystemTestCases
index 0ca2c07..18b1129 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsFileSystemTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=9000)
+ timeout=10800)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsHardwareTestCases
index 6dc9885b..7f8c693 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsHardwareTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=10800)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsLibcore b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsLibcore
index 3c1bfdf9..a66f4e6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsLibcore
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsLibcore
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=23400)
+ timeout=21600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaBitstreamsTestCases
index 991711d..40ba945 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaBitstreamsTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=57600)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaStressTestCases
index bae67eb..9a056b8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaStressTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=57600)
+ timeout=18000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaTestCases
index 709661c..a4e2760 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsMediaTestCases
@@ -30,6 +30,6 @@
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
login_precondition_commands=['lsblk -do NAME,RM | sed -n s/1$//p | xargs -n1 eject'],
- timeout=57600)
+ timeout=36000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsPrintTestCases
index 258b450..d7f55e1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsPrintTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=10800)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSecurity b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSecurity
index de462e6..75782ba 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSecurity
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSecurity
@@ -30,6 +30,6 @@
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
precondition_commands=['echo 3 > /proc/sys/kernel/perf_event_paranoid', 'modprobe configs'],
- timeout=16200)
+ timeout=12600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSensorTestCases
index 44bf01b..54240ee 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsSensorTestCases
@@ -30,6 +30,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=10800)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsShortcut b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsShortcut
index 5ec5918..7e93f79 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsShortcut
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsShortcut
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=9000)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsTheme b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsTheme
index cb89d51..8309773 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsTheme
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsTheme
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=25200)
+ timeout=5400)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsWidgetTestCases
index b3d259a..3e2f3c4 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.CtsWidgetTestCases
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=7200)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.tradefed-run-collect-tests-only-internal b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.tradefed-run-collect-tests-only-internal
index d6eac7c..c77ea19 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.tradefed-run-collect-tests-only-internal
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.tradefed-run-collect-tests-only-internal
@@ -30,6 +30,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=7200)
+ timeout=9000)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.vm-tests-tf
index 22e7d15..8c8c056 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r9.x86.vm-tests-tf
@@ -29,6 +29,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r9-linux_x86-x86.zip',
- timeout=7200)
+ timeout=3600)
parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_P/generate_controlfiles.py b/server/site_tests/cheets_CTS_P/generate_controlfiles.py
index dfe9322..f2e7919 100755
--- a/server/site_tests/cheets_CTS_P/generate_controlfiles.py
+++ b/server/site_tests/cheets_CTS_P/generate_controlfiles.py
@@ -93,7 +93,6 @@
{% endif %}
"""))
-_ALL = 'all'
# The dashboard suppresses upload to APFE for GS directories (based on autotest
# tag) that contain 'tradefed-run-collect-tests'. b/119640440
# Do not change the name/tag without adjusting the dashboard.
@@ -106,42 +105,25 @@
'CtsSensorTestCases': 30, # TODO(b/124528412)
}
-# TODO(ihf): Update timeouts once P is more stable.
# Timeout in hours.
_CTS_TIMEOUT = {
- 'CtsAccessibilityServiceTestCases': 3.0, # TODO(ihf): Remove once Nocturne stable.
- 'CtsActivityManagerDeviceTestCases': 3.0,
- 'CtsAppSecurityHostTestCases': 1.5,
- 'CtsDeqpTestCases': 30.0,
+ 'CtsAutoFillServiceTestCases': 2.5, # TODO(b/134662826)
+ 'CtsDeqpTestCases': 20.0,
'CtsDeqpTestCases.dEQP-EGL' : 2.0,
'CtsDeqpTestCases.dEQP-GLES2': 2.0,
'CtsDeqpTestCases.dEQP-GLES3': 6.0,
'CtsDeqpTestCases.dEQP-GLES31': 6.0,
'CtsDeqpTestCases.dEQP-VK': 15.0,
- 'CtsDevicePolicyManagerTestCases': 2.0,
- 'CtsFileSystemTestCases': 2.5,
- 'CtsHardwareTestCases': 3.0,
+ 'CtsFileSystemTestCases': 3.0,
'CtsIcuTestCases': 2.0,
- 'CtsLibcoreOjTestCases': 1.5,
- 'CtsLibcoreTestCases': 1.5,
- # Media might be reduced to 12h?
- 'CtsMediaBitstreamsTestCases': 16.0,
- 'CtsMediaStressTestCases': 16.0,
- 'CtsMediaTestCases': 16.0,
- 'CtsPrintTestCases': 3.0,
- 'CtsSecurityHostTestCases': 1.5,
+ 'CtsLibcoreOjTestCases': 2.0,
+ 'CtsMediaStressTestCases': 5.0,
+ 'CtsMediaTestCases': 10.0,
+ 'CtsPrintTestCases': 1.5,
'CtsSecurityTestCases': 2.0,
- 'CtsSensorTestCases': 3.0, # TODO(ihf): Remove once Nocturne stable.
- 'CtsShortcutHostTestCases': 1.5,
- 'CtsThemeHostTestCases': 6.0,
'CtsVideoTestCases': 1.5,
- 'CtsWidgetTestCases': 2.0,
- 'vm-tests-tf': 2.0,
- # Without media kevin runs 40h. :-(
- # Never seen this finish on grunt.
- _ALL: 60.0,
- _COLLECT: 2.0,
- _PUBLIC_COLLECT: 2.0,
+ _COLLECT: 2.5,
+ _PUBLIC_COLLECT: 2.5,
}
# Any test that runs as part as blocking BVT needs to be stable and fast. For
@@ -229,7 +211,7 @@
'CtsMediaStressTestCases',
'CtsMediaBitstreamsTestCases',
]
-_NEEDS_PUSH_MEDIA = _MEDIA_MODULES + [_ALL]
+_NEEDS_PUSH_MEDIA = _MEDIA_MODULES
# Modules that are known to need the default apps of Chrome (eg. Files.app).
_ENABLE_DEFAULT_APPS = [
@@ -319,7 +301,6 @@
'CtsMediaStressTestCases': 4,
'CtsSecurityTestCases': 4,
'CtsCameraTestCases': 4,
- _ALL: 4,
# Even though collect tests doesn't run very long, it must be the very first
# job executed inside of the suite. Hence it is the only 'LENGTHY' test.
_COLLECT: 5, # LENGTHY
@@ -1014,10 +995,7 @@
"""Command to run the modules specified by a control file."""
cmd = None
if modules.intersection(get_collect_modules(is_public)):
- if _COLLECT in modules or _PUBLIC_COLLECT in modules:
- cmd = _format_collect_cmd(retry=retry)
- elif _ALL in modules:
- cmd = _format_modules_cmd(is_public, modules, retry=retry)
+ cmd = _format_collect_cmd(retry=retry)
else:
cmd = _format_modules_cmd(is_public, modules, retry=retry)
return cmd
