Commit abd54457 authored by Ben Pastene's avatar Ben Pastene Committed by Commit Bot

Duplicate all src-side configs for chromium.chrome bots as chrome.

Ran a led build after switching their recipe configs:
https://ci.chromium.org/swarming/task/45ad9774aebf2610?server=chrome-swarming.appspot.com

It's trying to read 'src/testing/buildbot/chrome.json'. This should take
care of that.

Bug: 938113
Change-Id: I20c88e6d66c4c3c6092f5449d40d6d50e80b1c2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1678942
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Auto-Submit: Ben Pastene <bpastene@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672614}
parent 2263fa8c
This diff is collapsed.
...@@ -9,6 +9,86 @@ ...@@ -9,6 +9,86 @@
# * trailing commas are allowed. # * trailing commas are allowed.
[ [
{
'name': 'chrome',
'machines': {
'chromeos-amd64-generic-google-rel': {
'additional_compile_targets': [
'chrome',
],
},
'chromeos-betty-google-rel': {
'additional_compile_targets': [
'chromiumos_preflight',
],
'test_suites': {
'gtest_tests': 'chromeos_device_friendly_gtests',
'isolated_scripts': 'chromeos_isolated_scripts',
},
'swarming': {
'dimension_sets': [
{
'kvm': '1',
'os': 'Ubuntu-16.04',
'pool': 'chrome.tests.cros-vm',
},
],
},
},
'linux-chromeos-google-rel': {
'additional_compile_targets': [
'chrome',
'chrome_sandbox',
'linux_symbols',
'symupload'
],
'mixins': [
'chrome-swarming-pool',
'linux-trusty',
],
'test_suites': {
'gtest_tests': 'linux_chromeos_gtests',
},
},
'linux-google-rel': {
'additional_compile_targets': [
'chrome',
'chrome/installer/linux',
],
'mixins': [
'chrome-swarming-pool',
],
'test_suites': {
'isolated_scripts': 'chrome_sizes',
},
},
'mac-google-rel': {
'additional_compile_targets': [
'chrome',
],
'mixins': [
'chrome-swarming-pool',
'mac_10.14',
],
'test_suites': {
'isolated_scripts': 'chrome_sizes',
},
},
'win-google-rel': {
'additional_compile_targets': [
'chrome',
'chrome_official_builder',
],
'mixins': [
'chrome-swarming-pool',
'win10',
],
'test_suites': {
'isolated_scripts': 'chrome_sizes',
},
},
},
},
{ {
'name': 'chromium', 'name': 'chromium',
'machines': { 'machines': {
...@@ -542,6 +622,7 @@ ...@@ -542,6 +622,7 @@
}, },
}, },
}, },
# TODO(bpastene): Remove 'chromium.chrome' when it's been switched to 'chrome'
{ {
'name': 'chromium.chrome', 'name': 'chromium.chrome',
'machines': { 'machines': {
......
...@@ -13,6 +13,15 @@ ...@@ -13,6 +13,15 @@
# config names (where each config name is a key in the 'configs' dict, # config names (where each config name is a key in the 'configs' dict,
# below). MB uses this dict to look up which config to use for a given bot. # below). MB uses this dict to look up which config to use for a given bot.
'masters': { 'masters': {
'chrome': {
'chromeos-amd64-generic-google-rel': 'official_cros_chrome_sdk',
'chromeos-betty-google-rel': 'official_cros_chrome_sdk_headless_ozone',
'linux-chromeos-google-rel': 'official_goma_chromeos_minimal_symbols',
'linux-google-rel': 'official_goma',
'mac-google-rel': 'official_goma',
'win-google-rel': 'official_goma_x86',
},
'chromeos.chrome': { 'chromeos.chrome': {
'chrome-tot-chromeos-amd64-generic': 'cros_chrome_sdk', 'chrome-tot-chromeos-amd64-generic': 'cros_chrome_sdk',
'Chrome4CROS Packages': 'chromeos_with_codecs_release_bot', 'Chrome4CROS Packages': 'chromeos_with_codecs_release_bot',
...@@ -78,6 +87,7 @@ ...@@ -78,6 +87,7 @@
'x86 Emulator Tester': 'android_debug_static_bot_x86', 'x86 Emulator Tester': 'android_debug_static_bot_x86',
}, },
# TODO(bpastene): Remove 'chromium.chrome' when it's been switched to 'chrome'
'chromium.chrome': { 'chromium.chrome': {
'chromeos-amd64-generic-google-rel': 'official_cros_chrome_sdk', 'chromeos-amd64-generic-google-rel': 'official_cros_chrome_sdk',
'chromeos-betty-google-rel': 'official_cros_chrome_sdk_headless_ozone', 'chromeos-betty-google-rel': 'official_cros_chrome_sdk_headless_ozone',
......
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