cheets_CTS_P: Uprev DEV version to 8151358.
It increase the version number of 9.0r20.
Good timing to clean up the old waiver list.
Since there's no waiver jobs needed for now,
I just removed all the relevant files.
P CTS is almost frozen. I don't think we
need future waivers, and even if we need it,
it is easy to revive those files.
BUG=b:215446537
TEST=cheets_CTS_P.internal.arm.CtsUsbTests runs 8151358
Change-Id: I20aeb0e0d57cfdbcb62f5d588edbffce2f2b2279
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3463614
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
diff --git a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
index d120568..d4948b5 100644
--- a/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
+++ b/server/site_tests/cheets_CTS_P/cheets_CTS_P.py
@@ -37,9 +37,9 @@
('LATEST', 'x86'):
_INTERNAL_CTS + 'android-cts-9.0_r18-linux_x86-x86.zip',
('DEV', 'arm'):
- _INTERNAL_CTS + 'android-cts-7915399-linux_x86-arm.zip',
+ _INTERNAL_CTS + 'android-cts-8151358-linux_x86-arm.zip',
('DEV', 'x86'):
- _INTERNAL_CTS + 'android-cts-7915399-linux_x86-x86.zip',
+ _INTERNAL_CTS + 'android-cts-8151358-linux_x86-x86.zip',
}
_CTS_MEDIA_URI = _PUBLIC_CTS + 'android-cts-media-1.5.zip'
_CTS_MEDIA_LOCALPATH = '/tmp/android-cts-media'
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
deleted file mode 100644
index 5d1a45f..0000000
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.arm.waivers
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_dev.arm.waivers'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual, suite:arc-cts-unibuild, suite:arc-cts-hardware'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PY_VERSION = 3
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- needs_push_media=False,
- tag='9.0_dev.arm.waivers',
- test_name='cheets_CTS_P.9.0_dev.arm.waivers',
- run_template=['run', 'commandAndExit', 'cts', '--subplan', 'waivers', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- target_module='cts-dev',
- target_plan='waivers',
- load_waivers=False,
- bundle='arm',
- uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-7710893-linux_x86-arm.zip',
- timeout=7200)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers b/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
deleted file mode 100644
index cdcb8c9..0000000
--- a/server/site_tests/cheets_CTS_P/control.9.0_dev.x86.waivers
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.9.0_dev.x86.waivers'
-ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-qual, suite:arc-cts-unibuild, suite:arc-cts-hardware'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PY_VERSION = 3
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- needs_push_media=False,
- tag='9.0_dev.x86.waivers',
- test_name='cheets_CTS_P.9.0_dev.x86.waivers',
- run_template=['run', 'commandAndExit', 'cts', '--subplan', 'waivers', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- target_module='cts-dev',
- target_plan='waivers',
- load_waivers=False,
- bundle='x86',
- uri='gs://chromeos-arc-images/cts/bundle/P/android-cts-7710893-linux_x86-x86.zip',
- timeout=14400)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers b/server/site_tests/cheets_CTS_P/control.arm.waivers
deleted file mode 100644
index 3c2bd8c..0000000
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.arm.waivers'
-ATTRIBUTES = 'suite:cts_P, suite:cts, suite:cts-hardware'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PY_VERSION = 3
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- tag='arm.waivers',
- test_name='cheets_CTS_P.arm.waivers',
- run_template=['run', 'commandAndExit', 'cts', '--subplan', 'waivers', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- target_module='cts-dev',
- target_plan='waivers',
- load_waivers=False,
- bundle='arm',
- retry_manual_tests=True,
- warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-7710893-linux_x86-arm.zip',
- timeout=7200)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
deleted file mode 100644
index 312c32c..0000000
--- a/server/site_tests/cheets_CTS_P/control.arm.waivers-collect-tests-only
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.arm.waivers-collect-tests-only'
-ATTRIBUTES = 'suite:cts_P, suite:cts, suite:cts-hardware'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 1024000
-PY_VERSION = 3
-PRIORITY = 70
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using arm ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- max_retry=0,
- tag='arm.waivers-collect-tests-only',
- test_name='cheets_CTS_P.arm.waivers-collect-tests-only',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--subplan', 'waivers', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
- retry_template=None,
- target_module=None,
- target_plan='waivers',
- load_waivers=False,
- bundle='arm',
- retry_manual_tests=True,
- warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-7710893-linux_x86-arm.zip',
- timeout=360)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers b/server/site_tests/cheets_CTS_P/control.x86.waivers
deleted file mode 100644
index db5b61e..0000000
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.x86.waivers'
-ATTRIBUTES = 'suite:cts_P, suite:cts, suite:cts-hardware'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-PY_VERSION = 3
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- tag='x86.waivers',
- test_name='cheets_CTS_P.x86.waivers',
- run_template=['run', 'commandAndExit', 'cts', '--subplan', 'waivers', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--module-arg', 'CtsMediaTestCases:skip-media-download:true'],
- target_module='cts-dev',
- target_plan='waivers',
- load_waivers=False,
- bundle='x86',
- retry_manual_tests=True,
- warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-7710893-linux_x86-x86.zip',
- timeout=7200)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only b/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
deleted file mode 100644
index 92488c1..0000000
--- a/server/site_tests/cheets_CTS_P/control.x86.waivers-collect-tests-only
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2018 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file is not auto-generated. Don't delete it.
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_P.x86.waivers-collect-tests-only'
-ATTRIBUTES = 'suite:cts_P, suite:cts, suite:cts-hardware'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 1024000
-PY_VERSION = 3
-PRIORITY = 70
-DOC = 'Run waived tests of the Android Compatibility Test Suite (CTS) using x86 ABI in the ARC++ container.'
-
-def run_TS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_P',
- hosts=host_list,
- iterations=1,
- max_retry=0,
- tag='x86.waivers-collect-tests-only',
- test_name='cheets_CTS_P.x86.waivers-collect-tests-only',
- run_template=['run', 'commandAndExit', 'collect-tests-only', '--subplan', 'waivers', '--disable-reboot', '--module-arg', 'CtsMediaTestCases:skip-media-download:true', '--module-arg', 'CtsMediaStressTestCases:skip-media-download:true', '--module-arg', 'CtsMediaBitstreamsTestCases:skip-media-download:true'],
- retry_template=None,
- target_module=None,
- target_plan='waivers',
- load_waivers=False,
- bundle='x86',
- retry_manual_tests=True,
- warn_on_test_retry=False,
- uri='gs://chromeos-partner-gts/android-cts-7710893-linux_x86-x86.zip',
- timeout=360)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_P/subplans/waivers.xml b/server/site_tests/cheets_CTS_P/subplans/waivers.xml
deleted file mode 100644
index 041ec93..0000000
--- a/server/site_tests/cheets_CTS_P/subplans/waivers.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no' ?>
-<SubPlan version="2.0">
- <!--
- Unless there's special reason, the entries can be removed only
- when the DEV version bundle's provisional version number (like 9.0r13)
- is incremented. Otherwise the computation for the canonical list
- of test cases is confused. See b/151779432.
- -->
- <Entry include="CtsCameraTestCases android.hardware.cts.CameraTest#testLockUnlock" />
- <Entry include="CtsCameraTestCases android.hardware.cts.CameraTest#testRecordingHint" />
- <Entry include="CtsCameraTestCases android.hardware.cts.CameraTest#testVideoSnapshot" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.1d.optimal#r64_sint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.1d.optimal#r64_uint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.2d.optimal#r64_sint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.2d.optimal#r64_uint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.3d.optimal#r64_sint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.api.info.image_format_properties.3d.optimal#r64_uint" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.all_device#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.host_read_transfer_dst#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_image_sampled#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_index_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_image#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_storage_texel_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_uniform_texel_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_dst_vertex_buffer#1024" />
- <Entry include="CtsDeqpTestCases dEQP-VK.memory.pipeline_barrier.transfer_src_transfer_dst#1024" />
- <Entry include="CtsGraphicsTestCases android.graphics.drawable.cts.VectorDrawableTest#testMutate" />
- <Entry include="CtsNetTestCases android.net.wifi.cts.WifiManagerTest#testWifiScanTimestamp" />
-</SubPlan>
