cheets_CTS_R: Split CtsDeqp to a 32-bit job and a 64-bit job.
This is a large module, and is expected to be even larger
when we enable Vulkan soon. To lower the possibility to
hit the 16h time limit, this CL splits the internal lab job
to two.
BUG=b:188010340
TEST=cheets_CTS_R.11_r3.arm.CtsDeqp.64
Change-Id: If09875df58b80cbccf8e8cde4d330065d9d2ce92
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2891408
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>
(cherry picked from commit 008c609062512b43b7a87ce6321fff7b1b43f3f7)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2894233
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index c292457..f31adf0 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -159,6 +159,7 @@
]
CONFIG['SPLIT_BY_BITS_MODULES'] = [
+ 'CtsDeqpTestCases',
'CtsMediaTestCases',
]
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.32
similarity index 85%
copy from server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp
copy to server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.32
index e48602d..c917bf9 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.32
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.CtsDeqp'
+NAME = 'cheets_CTS_R.11_r3.arm.CtsDeqp.32'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-r, suite:arc-cts-unibuild'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
@@ -20,9 +20,9 @@
'cheets_CTS_R',
hosts=host_list,
iterations=1,
- tag='11_r3.arm.CtsDeqp',
- test_name='cheets_CTS_R.11_r3.arm.CtsDeqp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.arm.CtsDeqp.32',
+ test_name='cheets_CTS_R.11_r3.arm.CtsDeqp.32',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'armeabi-v7a'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqp',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.64
similarity index 85%
rename from server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp
rename to server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.64
index e48602d..9d29bc3 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsDeqp.64
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.CtsDeqp'
+NAME = 'cheets_CTS_R.11_r3.arm.CtsDeqp.64'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-r, suite:arc-cts-unibuild'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
@@ -20,9 +20,9 @@
'cheets_CTS_R',
hosts=host_list,
iterations=1,
- tag='11_r3.arm.CtsDeqp',
- test_name='cheets_CTS_R.11_r3.arm.CtsDeqp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.arm.CtsDeqp.64',
+ test_name='cheets_CTS_R.11_r3.arm.CtsDeqp.64',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'arm64-v8a'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqp',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 89%
copy from server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
copy to server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 9476eb9..ceae195 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
ATTRIBUTES = 'suite:arc-cts-qual'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
@@ -21,9 +21,9 @@
hosts=host_list,
iterations=1,
max_retry=9,
- tag='11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- test_name='cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+ test_name='cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'armeabi-v7a'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 89%
rename from server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 9476eb9..1b86a18 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
ATTRIBUTES = 'suite:arc-cts-qual'
DEPENDENCIES = 'arc'
JOB_RETRIES = 1
@@ -21,9 +21,9 @@
hosts=host_list,
iterations=1,
max_retry=9,
- tag='11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- test_name='cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+ test_name='cheets_CTS_R.11_r3.arm.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'arm64-v8a'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.32
similarity index 86%
rename from server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp
rename to server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.32
index e6ec892..3bd8a81 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.32
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.CtsDeqp'
+NAME = 'cheets_CTS_R.11_r3.x86.CtsDeqp.32'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-r, suite:arc-cts-unibuild'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
@@ -20,9 +20,9 @@
'cheets_CTS_R',
hosts=host_list,
iterations=1,
- tag='11_r3.x86.CtsDeqp',
- test_name='cheets_CTS_R.11_r3.x86.CtsDeqp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.x86.CtsDeqp.32',
+ test_name='cheets_CTS_R.11_r3.x86.CtsDeqp.32',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'x86'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqp',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.64
similarity index 86%
copy from server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp
copy to server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.64
index e6ec892..b2176f9 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsDeqp.64
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.CtsDeqp'
+NAME = 'cheets_CTS_R.11_r3.x86.CtsDeqp.64'
ATTRIBUTES = 'suite:arc-cts, suite:arc-cts-r, suite:arc-cts-unibuild'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
@@ -20,9 +20,9 @@
'cheets_CTS_R',
hosts=host_list,
iterations=1,
- tag='11_r3.x86.CtsDeqp',
- test_name='cheets_CTS_R.11_r3.x86.CtsDeqp',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.x86.CtsDeqp.64',
+ test_name='cheets_CTS_R.11_r3.x86.CtsDeqp.64',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'x86_64'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqp',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
similarity index 89%
rename from server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
rename to server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
index 3ba2cea..ce590f3 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32'
ATTRIBUTES = 'suite:arc-cts-qual'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
@@ -21,9 +21,9 @@
hosts=host_list,
iterations=1,
max_retry=9,
- tag='11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- test_name='cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+ test_name='cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.32',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'x86'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases b/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
similarity index 89%
copy from server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
copy to server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
index 3ba2cea..817fc4a 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64
@@ -5,7 +5,7 @@
# This file has been automatically generated. Do not edit!
AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases'
+NAME = 'cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64'
ATTRIBUTES = 'suite:arc-cts-qual'
DEPENDENCIES = 'arc, cts_abi_x86'
JOB_RETRIES = 1
@@ -21,9 +21,9 @@
hosts=host_list,
iterations=1,
max_retry=9,
- tag='11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- test_name='cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]'],
+ tag='11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+ test_name='cheets_CTS_R.11_r3.x86.all.CtsDeqpTestCases_-_CtsDeqpTestCases.64',
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--include-filter', 'CtsDeqpTestCases[secondary_user]', '--abi', 'x86_64'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='all.CtsDeqpTestCases_-_CtsDeqpTestCases',
target_plan=None,
