Run brya preuprev test on CBX enabled DUTs of ChromeOS pool.
Bug: b/361007683 Change-Id: Ibafa74229746b31a1f5cdb0af36b33179f96ebbf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5802735 Commit-Queue: Qijiang Fan <fqj@chromium.org> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org> Auto-Submit: Qijiang Fan <fqj@chromium.org> Cr-Commit-Position: refs/heads/main@{#1345310}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
94299cb833
commit
e645bf8aa4
infra/config
testing/buildbot
@ -357,6 +357,9 @@
|
||||
'ci_only': {
|
||||
'ci_only': True,
|
||||
},
|
||||
'cros-cbx-dut': {
|
||||
'cros_cbx': 'True',
|
||||
},
|
||||
'crosier-no-arc': {
|
||||
'args': [
|
||||
'--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.reven.chromeos_integration_tests.filter',
|
||||
|
@ -241,6 +241,8 @@ def _generate_mixin_values(formatter, mixin, generate_skylab_container = False):
|
||||
formatter.add_line("'cros_build_target': '{}',".format(skylab.cros_build_target))
|
||||
if skylab.cros_model:
|
||||
formatter.add_line("'cros_model': '{}',".format(skylab.cros_model))
|
||||
if skylab.cros_cbx:
|
||||
formatter.add_line("'cros_cbx': '{}',".format(skylab.cros_cbx))
|
||||
if skylab.cros_img:
|
||||
formatter.add_line("'cros_img': '{}',".format(skylab.cros_img))
|
||||
if skylab.use_lkgm:
|
||||
|
@ -277,6 +277,7 @@ def _skylab(
|
||||
cros_build_target = "",
|
||||
use_lkgm = False,
|
||||
cros_model = None,
|
||||
cros_cbx = False,
|
||||
autotest_name = None,
|
||||
bucket = None,
|
||||
dut_pool = None,
|
||||
@ -297,6 +298,8 @@ def _skylab(
|
||||
use_lkgm: If True, use a ChromeOS image version derived from
|
||||
chromeos/CHROMEOS_LKGM file.
|
||||
cros_model: Optional ChromeOS DUT model.
|
||||
cros_cbx: Whether to require a CBX DUT for given cros_board. For a
|
||||
board, not all models are CBX-capable.
|
||||
autotest_name: The name of the autotest to be executed in
|
||||
Skylab.
|
||||
bucket: Optional Google Storage bucket where the specified
|
||||
@ -319,6 +322,7 @@ def _skylab(
|
||||
cros_img = cros_img,
|
||||
use_lkgm = use_lkgm,
|
||||
cros_model = cros_model,
|
||||
cros_cbx = cros_cbx,
|
||||
autotest_name = autotest_name,
|
||||
bucket = bucket,
|
||||
dut_pool = dut_pool,
|
||||
|
@ -1624,6 +1624,13 @@ targets.mixin(
|
||||
),
|
||||
)
|
||||
|
||||
targets.mixin(
|
||||
name = "cros-cbx-dut",
|
||||
skylab = targets.skylab(
|
||||
cros_cbx = True,
|
||||
),
|
||||
)
|
||||
|
||||
# Pixel Tablet
|
||||
targets.mixin(
|
||||
name = "tangorpro",
|
||||
|
@ -56,7 +56,7 @@
|
||||
{
|
||||
"autotest_name": "chromium",
|
||||
"cros_board": "brya",
|
||||
"dut_pool": "chrome",
|
||||
"cros_cbx": "True",
|
||||
"name": "base_unittests RELEASE_LKGM",
|
||||
"run_cft": true,
|
||||
"shard_level_retries_on_ctp": 1,
|
||||
@ -68,7 +68,7 @@
|
||||
{
|
||||
"autotest_name": "chromium",
|
||||
"cros_board": "brya",
|
||||
"dut_pool": "chrome",
|
||||
"cros_cbx": "True",
|
||||
"name": "chromeos_integration_tests RELEASE_LKGM",
|
||||
"run_cft": true,
|
||||
"shard_level_retries_on_ctp": 1,
|
||||
@ -80,7 +80,7 @@
|
||||
{
|
||||
"autotest_name": "tast.chrome-from-gcs",
|
||||
"cros_board": "brya",
|
||||
"dut_pool": "chrome",
|
||||
"cros_cbx": "True",
|
||||
"name": "cq_medium_tast_tests RELEASE_LKGM",
|
||||
"run_cft": true,
|
||||
"shard_level_retries_on_ctp": 1,
|
||||
|
@ -357,6 +357,9 @@
|
||||
'ci_only': {
|
||||
'ci_only': True,
|
||||
},
|
||||
'cros-cbx-dut': {
|
||||
'cros_cbx': 'True',
|
||||
},
|
||||
'crosier-no-arc': {
|
||||
'args': [
|
||||
'--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.reven.chromeos_integration_tests.filter',
|
||||
|
@ -366,13 +366,13 @@
|
||||
],
|
||||
'mixins': [
|
||||
'skylab-cft',
|
||||
'cros-cbx-dut',
|
||||
],
|
||||
'test_suites': {
|
||||
'skylab_tests': 'chromeos_ctp_preuprev_tests',
|
||||
},
|
||||
'os_type': 'chromeos',
|
||||
'cros_board': 'brya',
|
||||
'cros_dut_pool': 'chrome',
|
||||
},
|
||||
'chromeos-jacuzzi-chrome-preuprev': {
|
||||
'additional_compile_targets': [
|
||||
|
Reference in New Issue
Block a user