cheets_CTS_R: Uprev to 7036291.
For rolling out changes in
android.googlesource.com/platform/cts/+log/35c6249e..47cd7947?no-merges
BUG=b:170182905, b:174531147, b:156204418, b:175244900
TEST=cheets_CTS_R.11_r3.arm.CtsSettings
Change-Id: If7dcc7489be0b9840e0f4e97eeaae7b1bae680d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2595563
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Jiyoun Ha <jiyounha@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jiyoun Ha <jiyounha@chromium.org>
diff --git a/server/site_tests/cheets_CTS_R/cheets_CTS_R.py b/server/site_tests/cheets_CTS_R/cheets_CTS_R.py
index dc7e5c6..6e55924 100644
--- a/server/site_tests/cheets_CTS_R/cheets_CTS_R.py
+++ b/server/site_tests/cheets_CTS_R/cheets_CTS_R.py
@@ -33,8 +33,8 @@
# Internal uprev for all CTS modules.
_INTERNAL_CTS = 'gs://chromeos-arc-images/cts/bundle/R/'
_CTS_LATEST_URI = {
- 'arm': _INTERNAL_CTS + 'android-cts-7026369-linux_x86-arm.zip',
- 'x86': _INTERNAL_CTS + 'android-cts-7026369-linux_x86-x86.zip',
+ 'arm': _INTERNAL_CTS + 'android-cts-7036291-linux_x86-arm.zip',
+ 'x86': _INTERNAL_CTS + 'android-cts-7036291-linux_x86-x86.zip',
}
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
index 623bef7..0edcafa 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
@@ -20,6 +20,7 @@
'cheets_CTS_R',
hosts=host_list,
iterations=1,
+ needs_push_media=True,
tag='11_r3.arm.CtsMediaTestCases.video',
test_name='cheets_CTS_R.11_r3.arm.CtsMediaTestCases.video',
run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecoderConformanceTest', '--include-filter', 'CtsMediaTestCases android.media.cts.EncodeDecodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--logcat-on-failure'],
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api b/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api
deleted file mode 100644
index 2a405a4..0000000
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.cts-system-all.api'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.arm.cts-system-all.api',
- test_name='cheets_CTS_R.11_r3.arm.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api',
- target_plan=None,
- bundle='arm',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git "a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133instant\135" "b/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133instant\135"
deleted file mode 100644
index 4cf3cc0..0000000
--- "a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133instant\135"
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.cts-system-all.api[instant]'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api[instant] 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.arm.cts-system-all.api[instant]',
- test_name='cheets_CTS_R.11_r3.arm.cts-system-all.api[instant]',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api[instant]', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api[instant]',
- target_plan=None,
- bundle='arm',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git "a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133secondary_user\135" "b/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133secondary_user\135"
deleted file mode 100644
index 2779b05..0000000
--- "a/server/site_tests/cheets_CTS_R/control.11_r3.arm.cts-system-all.api\133secondary_user\135"
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.cts-system-all.api[secondary_user]'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api[secondary_user] 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.arm.cts-system-all.api[secondary_user]',
- test_name='cheets_CTS_R.11_r3.arm.cts-system-all.api[secondary_user]',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api[secondary_user]', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api[secondary_user]',
- target_plan=None,
- bundle='arm',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api b/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api
deleted file mode 100644
index 6f1afbc..0000000
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.cts-system-all.api'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.x86.cts-system-all.api',
- test_name='cheets_CTS_R.11_r3.x86.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api',
- target_plan=None,
- bundle='x86',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git "a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133instant\135" "b/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133instant\135"
deleted file mode 100644
index 1cc69cb..0000000
--- "a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133instant\135"
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.cts-system-all.api[instant]'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api[instant] 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.x86.cts-system-all.api[instant]',
- test_name='cheets_CTS_R.11_r3.x86.cts-system-all.api[instant]',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api[instant]', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api[instant]',
- target_plan=None,
- bundle='x86',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
diff --git "a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133secondary_user\135" "b/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133secondary_user\135"
deleted file mode 100644
index 6a78c2e..0000000
--- "a/server/site_tests/cheets_CTS_R/control.11_r3.x86.cts-system-all.api\133secondary_user\135"
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020 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 has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.cts-system-all.api[secondary_user]'
-ATTRIBUTES = 'suite:arc-cts-r'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module cts-system-all.api[secondary_user] 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_R',
- hosts=host_list,
- iterations=1,
- tag='11_r3.x86.cts-system-all.api[secondary_user]',
- test_name='cheets_CTS_R.11_r3.x86.cts-system-all.api[secondary_user]',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'cts-system-all.api[secondary_user]', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
- target_module='cts-system-all.api[secondary_user]',
- target_plan=None,
- bundle='x86',
- uri='LATEST',
- use_jdk9=True,
- timeout=3600)
-
-parallel_simple(run_TS, machines)
