Commit 9a010080 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Add src-side build & test configs for internal pixelbook tester.

And refactor how we skip verifications of internal builders in
generate_buildbot_json.py

Bug: 1006414, 991417
Change-Id: I3520df707bfb19ba979c024d8f197e1b058c322a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1825780Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699946}
parent 26fe864c
......@@ -1076,6 +1076,77 @@
}
]
},
"chromeos-eve-google-rel": {
"additional_compile_targets": [
"chromiumos_preflight"
],
"gtest_tests": [
{
"args": [
"--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "luci.chrome.cros-dut"
}
]
},
"test": "base_unittests",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "luci.chrome.cros-dut"
}
],
"idempotent": false
},
"test": "chrome_all_tast_tests",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve",
"os": "ChromeOS",
"pool": "luci.chrome.cros-dut"
}
]
},
"test": "cros_browser_sanity_test",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
]
},
"chromeos-kevin-google-rel": {
"additional_compile_targets": [
"chromiumos_preflight"
......
......@@ -1009,7 +1009,7 @@ class BBJSONGenerator(object):
bot_names.add(l[l.rindex('/') + 1:l.rindex('"')])
return bot_names
def get_bots_that_do_not_actually_exist(self):
def get_builders_that_do_not_actually_exist(self):
# Some of the bots on the chromium.gpu.fyi waterfall in particular
# are defined only to be mirrored into trybots, and don't actually
# exist on any of the waterfalls or consoles.
......@@ -1049,15 +1049,15 @@ class BBJSONGenerator(object):
'win32-dbg',
'win-archive-dbg',
'win32-archive-dbg',
# Defined in internal configs.
'chromeos-amd64-generic-google-rel',
'chromeos-betty-google-rel',
'chromeos-betty-pi-arc-google-rel',
'chromeos-kevin-google-rel',
# code coverage, see https://crbug.com/1000367.
'linux-chromeos-coverage-rel-dummy',
]
def get_internal_waterfalls(self):
# Similar to get_builders_that_do_not_actually_exist above, but for
# waterfalls defined in internal configs.
return ['chrome']
def check_input_file_consistency(self, verbose=False):
self.check_input_files_sorting(verbose)
......@@ -1067,10 +1067,14 @@ class BBJSONGenerator(object):
# All bots should exist.
bot_names = self.get_valid_bot_names()
bots_that_dont_exist = self.get_bots_that_do_not_actually_exist()
internal_waterfalls = self.get_internal_waterfalls()
builders_that_dont_exist = self.get_builders_that_do_not_actually_exist()
for waterfall in self.waterfalls:
# TODO(crbug.com/991417): Remove the need for this exception.
if waterfall['name'] in internal_waterfalls:
continue # pragma: no cover
for bot_name in waterfall['machines']:
if bot_name in bots_that_dont_exist:
if bot_name in builders_that_dont_exist:
continue # pragma: no cover
if bot_name not in bot_names:
if waterfall['name'] in ['client.v8.chromium', 'client.v8.fyi']:
......@@ -1131,7 +1135,7 @@ class BBJSONGenerator(object):
if removal not in all_bots:
missing_bots.add(removal)
missing_bots = missing_bots - set(bots_that_dont_exist)
missing_bots = missing_bots - set(builders_that_dont_exist)
if missing_bots:
raise BBGenErr('The following nonexistent machines were referenced in '
'the test suite exceptions: ' + str(missing_bots))
......
......@@ -457,7 +457,7 @@
},
},
'chromeos_device_kevin_tests': {
'chromeos_device_tests': {
'base_unittests': {
'args': [
'--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.base_unittests.filter',
......
......@@ -53,12 +53,30 @@
],
},
},
'chromeos-eve-google-rel': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_tests',
},
'swarming': {
'dimension_sets': [
{
'os': 'ChromeOS',
'device_type': 'eve',
'pool': 'luci.chrome.cros-dut',
},
],
},
'os_type': 'chromeos'
},
'chromeos-kevin-google-rel': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_kevin_tests',
'gtest_tests': 'chromeos_device_tests',
},
'swarming': {
'dimension_sets': [
......@@ -758,7 +776,7 @@
],
},
'test_suites': {
'gtest_tests': 'chromeos_device_kevin_tests',
'gtest_tests': 'chromeos_device_tests',
'isolated_scripts': 'chromeos_remote_device_isolated_tests',
},
'os_type': 'chromeos',
......
......@@ -17,6 +17,7 @@
'chromeos-amd64-generic-google-rel': 'official_cros_chrome_sdk',
'chromeos-betty-google-rel': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-betty-pi-arc-google-rel': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-eve-google-rel': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-kevin-google-rel': 'official_cros_chrome_sdk_headless_ozone',
'linux-chromeos-google-rel': 'official_goma_chromeos_minimal_symbols',
'linux-google-rel': 'official_goma',
......@@ -719,6 +720,7 @@
'tryserver.chrome': {
'chromeos-betty-chrome': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-betty-pi-arc-chrome': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-eve-chrome': 'official_cros_chrome_sdk_headless_ozone',
'chromeos-kevin-chrome': 'official_cros_chrome_sdk_headless_ozone',
'linux-chrome': 'official_goma',
'linux-chromeos-chrome': 'official_goma_chromeos_minimal_symbols',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment