Revert "cheets_CTS_P: Temporarily increase the retry count of dEQP to 30."
This reverts commit 824f122e8624241a8c31dbbca7fe02bae74ed3e2.
Reason for revert: The root cause is fixed
Original change's description:
> cheets_CTS_P: Temporarily increase the retry count of dEQP to 30.
>
> Temporary workaround until the super flaky test
> of b/182397469 is fixed.
>
> BUG=b:182397469
> TEST=cheets_CTS_P.x86.CtsDeqpTestCases
>
> Change-Id: I864e71289dfaa59d9869b05370467eac2bc9b878
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2807200
> Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
> Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
> Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
> Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Bug: b:182397469
Change-Id: Ie7ddce4126525671cc3774718e87efed97d6f3d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2822175
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index e0a27cc..dc29919 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -56,9 +56,9 @@
CONFIG['CTS_JOB_RETRIES_IN_PUBLIC'] = 1
CONFIG['CTS_QUAL_RETRIES'] = 9
CONFIG['CTS_MAX_RETRIES'] = {
- 'CtsDeqpTestCases': 30, # TODO(b/126787654, b/182397469)
- 'CtsGraphicsTestCases': 5, # TODO(b/155056869)
- 'CtsSensorTestCases': 30, # TODO(b/124528412)
+ 'CtsDeqpTestCases': 15, # TODO(b/126787654)
+ 'CtsGraphicsTestCases': 5, # TODO(b/155056869)
+ 'CtsSensorTestCases': 30, # TODO(b/124528412)
}
# Timeout in hours.
@@ -257,18 +257,18 @@
# This information is changed based on regular analysis of the failure rate on
# partner moblabs.
CONFIG['PUBLIC_MODULE_RETRY_COUNT'] = {
- 'CtsAccessibilityServiceTestCases': 12,
- 'CtsActivityManagerDeviceTestCases': 12,
- 'CtsBluetoothTestCases': 10,
- 'CtsDeqpTestCases': 30,
- 'CtsFileSystemTestCases': 10,
- 'CtsGraphicsTestCases': 12,
- 'CtsIncidentHostTestCases': 12,
- 'CtsNetTestCases': 10,
- 'CtsSecurityHostTestCases': 10,
- 'CtsSensorTestCases': 12,
- 'CtsUsageStatsTestCases': 10,
- _PUBLIC_COLLECT: 0,
+ 'CtsAccessibilityServiceTestCases': 12,
+ 'CtsActivityManagerDeviceTestCases': 12,
+ 'CtsBluetoothTestCases': 10,
+ 'CtsDeqpTestCases': 15,
+ 'CtsFileSystemTestCases': 10,
+ 'CtsGraphicsTestCases': 12,
+ 'CtsIncidentHostTestCases': 12,
+ 'CtsNetTestCases': 10,
+ 'CtsSecurityHostTestCases': 10,
+ 'CtsSensorTestCases': 12,
+ 'CtsUsageStatsTestCases': 10,
+ _PUBLIC_COLLECT: 0,
}
CONFIG['PUBLIC_OVERRIDE_TEST_PRIORITY'] = {
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.32
index cc94e2a..7431b91 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.32
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.arm.CtsDeqpTestCases.32',
test_name='cheets_CTS_P.9.0_r15.arm.CtsDeqpTestCases.32',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'armeabi-v7a', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.64
index 57c2062..694a64f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.CtsDeqpTestCases.64
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.arm.CtsDeqpTestCases.64',
test_name='cheets_CTS_P.9.0_r15.arm.CtsDeqpTestCases.64',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'arm64-v8a', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index f322d4f..61407f6 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
test_name='cheets_CTS_P.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'armeabi-v7a', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 16cbe5c..486cbf7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
test_name='cheets_CTS_P.9.0_r15.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'arm64-v8a', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.32
index 615f8d4..2baa964 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.32
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.x86.CtsDeqpTestCases.32',
test_name='cheets_CTS_P.9.0_r15.x86.CtsDeqpTestCases.32',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.64
index 66d8e7b..4aaaf3b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.CtsDeqpTestCases.64
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.x86.CtsDeqpTestCases.64',
test_name='cheets_CTS_P.9.0_r15.x86.CtsDeqpTestCases.64',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86_64', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32 b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 601e4e0..c5edac1 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
test_name='cheets_CTS_P.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64 b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 021edff..08922d3 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -20,7 +20,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
test_name='cheets_CTS_P.9.0_r15.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases', '--abi', 'x86_64', '--dynamic-config-url='],
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
index 89f07b0..80fc2ab 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
@@ -21,7 +21,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='arm.CtsDeqpTestCases',
test_name='cheets_CTS_P.arm.CtsDeqpTestCases',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
index 858ddfa..a47e533 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
@@ -21,7 +21,7 @@
'cheets_CTS_P',
hosts=host_list,
iterations=1,
- max_retry=30,
+ max_retry=15,
tag='x86.CtsDeqpTestCases',
test_name='cheets_CTS_P.x86.CtsDeqpTestCases',
run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsDeqpTestCases'],
