cheets_CTS_P/R: Camerabox runs only stop loading manual test list.
Instead of stopping the whole waivering mechanism.
BUG=b:197190574
TEST=Let's monitor camerabox tests on bots
Change-Id: I3a1ca51326fc483daef34530d1308c165358444b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3158221
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Rohit Makasana <rohitbm@chromium.org>
Commit-Queue: Jaydeep Mehta <jaydeepmehta@google.com>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Jaydeep Mehta <jaydeepmehta@google.com>
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 6c4d742..6fcac00 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -126,7 +126,7 @@
hard_reboot_on_failure=True,
{%- endif %}
{%- if camera_facing %}
- load_waivers=False,
+ retry_manual_tests=True,
{%- endif %}
timeout={{timeout}})
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
index c508aab..e05f933 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.back
@@ -30,7 +30,7 @@
target_plan=None,
bundle='arm',
uri='LATEST',
- load_waivers=False,
+ retry_manual_tests=True,
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
index 1044cfc..5c1cf81 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.noled.camerabox.front
@@ -30,7 +30,7 @@
target_plan=None,
bundle='arm',
uri='LATEST',
- load_waivers=False,
+ retry_manual_tests=True,
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
index 6d4500f..950f66e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.back
@@ -30,7 +30,7 @@
target_plan=None,
bundle='x86',
uri='LATEST',
- load_waivers=False,
+ retry_manual_tests=True,
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
index 2b99114..9dc877e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.noled.camerabox.front
@@ -30,7 +30,7 @@
target_plan=None,
bundle='x86',
uri='LATEST',
- load_waivers=False,
+ retry_manual_tests=True,
timeout=7200)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
index 26cf894..4e2e22d 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.back
@@ -31,7 +31,7 @@
bundle='arm',
uri='LATEST',
use_jdk9=True,
- load_waivers=False,
+ retry_manual_tests=True,
timeout=5400)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
index a409089..0c8db36 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.noled.camerabox.front
@@ -31,7 +31,7 @@
bundle='arm',
uri='LATEST',
use_jdk9=True,
- load_waivers=False,
+ retry_manual_tests=True,
timeout=5400)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
index dd22b76..15fb484 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.back
@@ -31,7 +31,7 @@
bundle='x86',
uri='LATEST',
use_jdk9=True,
- load_waivers=False,
+ retry_manual_tests=True,
timeout=5400)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
index a612954..728603e 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.noled.camerabox.front
@@ -31,7 +31,7 @@
bundle='x86',
uri='LATEST',
use_jdk9=True,
- load_waivers=False,
+ retry_manual_tests=True,
timeout=5400)
parallel_simple(run_TS, machines)
