Skip to content

GitLab

T
tangled
Commit c393e098 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot
Browse files
Options

Move mb and test configs for arc-r bots after builder_group switch. 

The bots moved from builder_group=chrome to internal.chrome.fyi, and I
forgot to update their src-side configs.

Bug: 1129540
Change-Id: I608e9e1130d720bb54833a33d71f7bdc0d180f72
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417307
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Auto-Submit: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarHaiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#808170}
parent 7aefe974
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 221 deletions
testing/buildbot/chrome.json
View file @ c393e098
......@@ -6,74 +6,6 @@
"chromiumos_preflight"
]
},
"chromeos-betty-arc-r-chrome": {
"additional_compile_targets": [
"chromiumos_preflight"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/"
}
]
},
"chromeos-betty-pi-arc-cfi-thin-lto-chrome": {
"additional_compile_targets": [
"chromiumos_preflight"
......@@ -791,109 +723,6 @@
}
]
},
"chromeos-eve-arc-r-chrome": {
"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-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base: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-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"experiment_percentage": 100,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
]
},
"chromeos-eve-chrome": {
"additional_compile_targets": [
"chromiumos_preflight"
......
testing/buildbot/generate_buildbot_json.py
View file @ c393e098
......@@ -1442,7 +1442,7 @@ class BBJSONGenerator(object):
def get_internal_waterfalls(self):
# Similar to get_builders_that_do_not_actually_exist above, but for
# waterfalls defined in internal configs.
return ['chrome', 'chrome.pgo', 'internal.soda']
return ['chrome', 'chrome.pgo', 'internal.chrome.fyi', 'internal.soda']
def check_input_file_consistency(self, verbose=False):
self.check_input_files_sorting(verbose)
......
testing/buildbot/internal.chrome.fyi.json 0 → 100644
View file @ c393e098
{
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {},
"chromeos-betty-arc-r-chrome": {
"additional_compile_targets": [
"chromiumos_preflight"
],
"gtest_tests": [
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/"
},
{
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/"
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r|kevin",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/"
}
]
},
"chromeos-eve-arc-r-chrome": {
"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-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "base_unittests",
"test_id_prefix": "ninja://base: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-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "chrome_all_tast_tests",
"test_id_prefix": "ninja://chromeos:chrome_all_tast_tests/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"experiment_percentage": 100,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "cros_browser_sanity_test",
"test_id_prefix": "ninja://chromeos:cros_browser_sanity_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
},
{
"args": [
"--strip-chrome"
],
"merge": {
"script": "//tools/perf/process_perf_results.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"device_type": "eve-arc-r",
"os": "ChromeOS",
"pool": "chrome.tests"
}
],
"idempotent": false,
"service_account": "chrome-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "disk_usage_tast_test",
"test_id_prefix": "ninja://chromeos:disk_usage_tast_test/",
"trigger_script": {
"script": "//testing/trigger_scripts/chromeos_device_trigger.py"
}
}
]
}
}
testing/buildbot/waterfalls.pyl
View file @ c393e098
......@@ -20,35 +20,6 @@
'chromiumos_preflight',
],
},
'chromeos-betty-arc-r-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_browser_integration_tests',
},
'swarming': {
'dimension_sets': [
{
'pool': 'chrome.tests',
# Due to the nature of the ARC VM inside CrOS, betty-arc-r tests
# can't run on GCE images. GCE VM -> CrOS VM -> Android VM proves
# to be too many layers of virtualization for the tests. However,
# we can use KVM-enable baremetal machines in the lab, which
# avoids the GCE VM layer and makes the tests happier. Use the
# device hosts in the CrOS device pool for this purpose since
# they're all running CrOS tests anyway.
'os': 'ChromeOS',
# The eve-arc-r and kevin pools aren't very busy, use those. Note
# that the devices themselves will be unused for the duration of
# these tests.
# FIXME: Allocate dedicated baremetal machines for these tests
# rather than using CrOS device bots.
'device_type': 'eve-arc-r|kevin',
},
],
},
},
'chromeos-betty-pi-arc-cfi-thin-lto-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
......@@ -84,24 +55,6 @@
],
},
},
'chromeos-eve-arc-r-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_gtests',
},
'swarming': {
'dimension_sets': [
{
'os': 'ChromeOS',
'device_type': 'eve-arc-r',
'pool': 'chrome.tests',
},
],
},
'os_type': 'chromeos'
},
'chromeos-eve-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
......@@ -5565,6 +5518,61 @@
},
},
},
{
'project': 'chrome',
'bucket': 'ci',
'name': 'internal.chrome.fyi',
'mixins': ['chrome-tester-service-account'],
'machines': {
'chromeos-betty-arc-r-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_browser_integration_tests',
},
'swarming': {
'dimension_sets': [
{
'pool': 'chrome.tests',
# Due to the nature of the ARC VM inside CrOS, betty-arc-r tests
# can't run on GCE images. GCE VM -> CrOS VM -> Android VM proves
# to be too many layers of virtualization for the tests. However,
# we can use KVM-enable baremetal machines in the lab, which
# avoids the GCE VM layer and makes the tests happier. Use the
# device hosts in the CrOS device pool for this purpose since
# they're all running CrOS tests anyway.
'os': 'ChromeOS',
# The eve-arc-r and kevin pools aren't very busy, use those. Note
# that the devices themselves will be unused for the duration of
# these tests.
# FIXME: Allocate dedicated baremetal machines for these tests
# rather than using CrOS device bots.
'device_type': 'eve-arc-r|kevin',
},
],
},
},
'chromeos-eve-arc-r-chrome': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_gtests',
},
'swarming': {
'dimension_sets': [
{
'os': 'ChromeOS',
'device_type': 'eve-arc-r',
'pool': 'chrome.tests',
},
],
},
'os_type': 'chromeos'
},
},
},
{
'project': 'chrome',
'bucket': 'ci',
......
tools/mb/mb_config.pyl
View file @ c393e098
......@@ -15,11 +15,9 @@
'masters': {
'chrome': {
'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official',
'chromeos-betty-arc-r-chrome': 'chromeos_betty-arc-r_include_unwind_tables_official_use_fake_dbus_clients',
'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official',
'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
'chromeos-kevin-chrome': 'chromeos_kevin_include_unwind_tables_official',
# Don't include unwind tables for the remaining three builders since
# they monitor binary size growth, which may be affected by the tables.
......@@ -668,6 +666,8 @@
'internal.chrome.fyi': {
'chromeos-amd64-generic-lacros-internal-rel': 'chromeos_amd64-generic_lacros_rel',
'chromeos-betty-arc-r-chrome': 'chromeos_betty-arc-r_include_unwind_tables_official_use_fake_dbus_clients',
'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
'linux-autofill-captured-sites-rel': 'release_bot',
'linux-password-manager-captured-sites-rel': 'release_bot',
'lorenz-graph-dbg': 'android_debug_static_bot',
......
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