Revert "cheets_CTS_P: Attempt powercycling after consecutive camera test failures."
This reverts commit 6f921f1b9a5ca7c5dbddaf7bdfbeea07101832eb.
Reason for revert: it didn't work
Original change's description:
> cheets_CTS_P: Attempt powercycling after consecutive camera test failures.
>
> Observation on the DUT test history, powercycling looks improving the test
> stability. Let us verify the hypothesis by enforcing the step.
>
> BUG=b:142222651
> TEST=bot
>
> Change-Id: I8e2a7f49f4ff18e76c11dc001bbb16c18a50df94
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1978118
> Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
> Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
> Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
> Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Bug: b:142222651
Change-Id: I9d22d95ba4bc30e0e2b9a0e551bf484b69be98f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/1992943
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>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index 891a8d5..f4efcdb 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -151,9 +151,7 @@
]
CONFIG['NEEDS_POWER_CYCLE'] = [
- 'CtsBluetoothTestCases', # b/141472122 TODO(kinaba): remove this
- 'CtsCameraApi25TestCases', # b/142222651
- 'CtsCameraTestCases', # b/142222651
+ 'CtsBluetoothTestCases',
]
CONFIG['HARDWARE_DEPENDENT_MODULES'] = [
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 3e2e9fc..dcae5f3 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -720,7 +720,6 @@
for target, config in get_extra_modules_dict(is_public, abi).items():
if combined in config['SUBMODULES']:
target_module = target
- is_camerabox_test = (camera_facing is not None)
return _CONTROLFILE_TEMPLATE.render(
year=CONFIG['COPYRIGHT_YEAR'],
name=name,
@@ -731,7 +730,7 @@
modules,
abi,
is_public,
- is_camerabox_test=is_camerabox_test),
+ is_camerabox_test=(camera_facing is not None)),
extra_artifacts=get_extra_artifacts(modules),
extra_artifacts_host=get_extra_artifacts_host(modules),
job_retries=get_job_retries(modules, is_public),
@@ -744,8 +743,7 @@
tag=tag,
uri=uri,
DOC=get_doc(modules, abi, is_public),
- servo_support_needed=(not is_camerabox_test and
- servo_support_needed(modules, is_public)),
+ servo_support_needed = servo_support_needed(modules, is_public),
max_retries=get_max_retries(modules, abi, suites, is_public),
timeout=calculate_timeout(modules, suites),
run_template=get_run_template(modules, is_public),
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
index 84355a6..6c9fb8c 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.arm.CtsCamera
@@ -4,8 +4,6 @@
# This file has been automatically generated. Do not edit!
-from autotest_lib.server import utils
-
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r10.arm.CtsCamera'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw'
@@ -16,19 +14,8 @@
MAX_RESULT_SIZE_KB = 512000
DOC = 'Run module CtsCameraApi25TestCases, CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
-# For local debugging, if your test setup doesn't have servo, REMOVE these
-# two lines.
-args_dict = utils.args_to_dict(args)
-servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
-
def run_TS(machine):
- # REMOVE 'servo_args=servo_args' arg for local debugging if your test
- # setup doesn't have servo.
- try:
- host_list = [hosts.create_host(machine, servo_args=servo_args)]
- except:
- # Just ignore any servo setup flakiness.
- host_list = [hosts.create_host(machine)]
+ host_list = [hosts.create_host(machine)]
job.run_test(
'cheets_CTS_P',
hosts=host_list,
@@ -41,7 +28,6 @@
target_plan=None,
bundle='arm',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-arm.zip',
- hard_reboot_on_failure=True,
timeout=5400)
parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
index 999c249..8b72f07 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r10.x86.CtsCamera
@@ -4,8 +4,6 @@
# This file has been automatically generated. Do not edit!
-from autotest_lib.server import utils
-
AUTHOR = 'ARC++ Team'
NAME = 'cheets_CTS_P.9.0_r10.x86.CtsCamera'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-unibuild, suite:arc-cts-unibuild-hw, suite:vmtest-informational1'
@@ -16,19 +14,8 @@
MAX_RESULT_SIZE_KB = 512000
DOC = 'Run module CtsCameraApi25TestCases, CtsCameraTestCases of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
-# For local debugging, if your test setup doesn't have servo, REMOVE these
-# two lines.
-args_dict = utils.args_to_dict(args)
-servo_args = hosts.CrosHost.get_servo_arguments(args_dict)
-
def run_TS(machine):
- # REMOVE 'servo_args=servo_args' arg for local debugging if your test
- # setup doesn't have servo.
- try:
- host_list = [hosts.create_host(machine, servo_args=servo_args)]
- except:
- # Just ignore any servo setup flakiness.
- host_list = [hosts.create_host(machine)]
+ host_list = [hosts.create_host(machine)]
job.run_test(
'cheets_CTS_P',
hosts=host_list,
@@ -41,7 +28,6 @@
target_plan=None,
bundle='x86',
uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-9.0_r10-linux_x86-x86.zip',
- hard_reboot_on_failure=True,
timeout=5400)
parallel_simple(run_TS, machines)