Revert "cheets_CTS_R: Add testVideoPreviewSurfaceSharing to the workaround job."
This reverts commit d919864120bcacb676b3ba2755c3127ebf63d0a6.
Reason for revert: The experiment didn't work well
Original change's description:
> cheets_CTS_R: Add testVideoPreviewSurfaceSharing to the workaround job.
>
> The test case is suspected to share the same cause of flakiness
> as the NativeCameraDeviceTest.
>
> BUG=b:216665243
> TEST=cheets_CTS_R.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest
>
> Change-Id: I2724094fdfd09a663e851339bde2553bb956d7ba
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3428750
> Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
> Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
> Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
> Reviewed-by: Rintaro Kuroiwa <rkuroiwa@google.com>
> Commit-Queue: Rintaro Kuroiwa <rkuroiwa@google.com>
> Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
> Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
Bug: b:216665243
Change-Id: I667d9d44a408323814ca8cc797757039a8e2910d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3452742
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Rintaro Kuroiwa <rkuroiwa@google.com>
Commit-Queue: Rintaro Kuroiwa <rkuroiwa@google.com>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index 6ae6eb4..ed9f678 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -379,14 +379,10 @@
'android.app.cts.SystemFeaturesTest'
],
'CtsCameraTestCases.NativeCameraDeviceTest': [
- '--include-filter',
- 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest',
- '--include-filter',
- 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest',
- '--include-filter',
- 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]',
- '--include-filter',
- 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]',
+ '--module',
+ 'CtsCameraTestCases',
+ '--test',
+ 'android.hardware.camera2.cts.NativeCameraDeviceTest',
],
'CtsDeqpTestCases.dEQP-EGL': [
'--include-filter', 'CtsDeqpTestCases', '--module',
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
index d5d2f3e..6139dec 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index ffda705..83de405 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest
index c6b6b11..0444470 100644
--- a/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -24,7 +24,7 @@
max_retry=9,
tag='internal.arm.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index 79d3ab9..888a31b 100644
--- a/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.internal.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest
index fa4fc89..205c348 100644
--- a/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -24,7 +24,7 @@
max_retry=9,
tag='internal.x86.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index 82d524b..488da24 100644
--- a/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.internal.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
index 0f0ee60..0ff5509 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.x86.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index 43edfdb..7808edd 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.NativeCameraDeviceTest', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]', '--include-filter', 'CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest#testVideoPreviewSurfaceSharing[1]'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
