Commit e95b8172 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot

Reland "Migrate luci-milo-dev.cfg to starlark."

This is a reland of f26b6b6d

generate_buildbot_json.py has been updated to look for
luci-milo-dev.cfg in the generated subdirectory.

Original change's description:
> Migrate luci-milo-dev.cfg to starlark.
>
> Bug: 1011908
> Change-Id: Ic7f4fc26d75811f04c9f988866bb479a40e0d0c3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1869713
> Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
> Reviewed-by: Aaron Gable <agable@chromium.org>
> Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#708714}

Bug: 1011908
Change-Id: Idef08a086a4d764967a9a2e9b20a5dc5903d9111
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877138
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709099}
parent 76bfd958
......@@ -21,7 +21,7 @@ def _CommonChecks(input_api, output_api):
kwargs={},
message=output_api.PresubmitError))
if ('infra/config/generated/luci-milo.cfg' in input_api.LocalPaths() or
'infra/config/luci-milo-dev.cfg' in input_api.LocalPaths()):
'infra/config/generated/luci-milo-dev.cfg' in input_api.LocalPaths()):
commands.append(
input_api.Command(
name='testing/buildbot config checks',
......
......@@ -14,16 +14,11 @@ lucicfg.config(
fail_on_warnings = True,
)
# Copy the not-yet migrated files to the generated outputs
# TODO(https://crbug.com/1011908) Migrate the configuration in these files to starlark
[lucicfg.emit(dest = f, data = io.read_file(f)) for f in (
'luci-milo-dev.cfg',
)]
luci.project(
name = 'chromium',
buildbucket = 'cr-buildbucket-dev.appspot.com',
logdog = 'luci-logdog-dev.appspot.com',
milo = 'luci-milo-dev.appspot.com',
scheduler = 'luci-scheduler-dev.appspot.com',
swarming = 'chromium-swarm-dev.appspot.com',
acls = [
......@@ -50,6 +45,13 @@ luci.logdog(
gs_bucket = 'chromium-luci-logdog',
)
luci.milo(
logo = 'https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg',
)
exec('//dev/buckets/ci.star')
exec('//dev/buckets/cron.star')
exec('//dev/buckets/try.star')
exec('//dev/consoles/chromium.swarm.star')
exec('//dev/consoles/snapshots.star')
oncalls: {
name: "Chromium"
url: "https://build.chromium.org/p/chromium/sheriff.json"
}
oncalls: {
name: "Android"
url: "https://build.chromium.org/p/chromium/sheriff_android.json"
}
oncalls: {
name: "iOS"
url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
}
oncalls: {
name: "CrOS MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_mtv.json"
}
oncalls: {
name: "CrOS non-MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_nonmtv.json"
}
oncalls: {
name: "ChromeOS Gardener"
url: "https://build.chromium.org/p/chromium/sheriff_cr_cros_gardeners.json"
}
oncalls: {
name: "GPU"
url: "https://build.chromium.org/p/chromium/sheriff_gpu.json"
}
oncalls: {
name: "Angle"
url: "https://build.chromium.org/p/chromium/sheriff_angle.json"
}
oncalls: {
name: "Perf"
url: "https://build.chromium.org/p/chromium/sheriff_perf.json"
}
oncalls: {
name: "Perfbot"
url: "https://build.chromium.org/p/chromium/sheriff_perfbot.json"
}
oncalls: {
name: "V8"
url: "https://build.chromium.org/p/chromium/sheriff_v8.json"
}
oncalls: {
name: "Trooper"
url: "https://build.chromium.org/p/chromium/trooper.json"
}
links: {
name: "Builds"
links: {
text: "continuous"
url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
alt: "Continuous browser snapshots"
}
links: {
text: "symbols"
url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
alt: "Windows Symbols"
}
links: {
text: "status"
url: "https://chromium-status.appspot.com/"
alt: "Current tree status"
}
}
links: {
name: "Dashboards"
links: {
text: "perf"
url: "https://chromeperf.appspot.com/"
alt: "Chrome perf dashboard"
}
links {
text: "flake-portal"
url: "https://analysis.chromium.org/p/chromium/flake-portal"
alt: "New flake portal"
}
links {
text: "legacy-flakiness"
url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
alt: "Legacy flakiness dashboard"
}
}
links: {
name: "Chromium"
links: {
text: "source"
url: "https://chromium.googlesource.com/chromium/src"
alt: "Chromium source code repository"
}
links: {
text: "reviews"
url: "https://chromium-review.googlesource.com"
alt: "Chromium code review tool"
}
links: {
text: "bugs"
url: "https://crbug.com"
alt: "Chromium bug tracker"
}
links: {
text: "dev"
url: "https://dev.chromium.org/Home"
alt: "Chromium developer home page"
}
links: {
text: "support"
url: "https://support.google.com/chrome/#topic=7438008"
alt: "Google Chrome help center"
}
}
links: {
name: "Consoles"
links: {
text: "swarm"
url: "/p/chromium/g/chromium.swarm"
alt: "Chromium Swarm console"
}
links: {
text: "prod"
url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
alt: "Main luci-milo console"
}
}
links: {
name: "Navigate"
links: {
text: "about"
url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
alt: "Tour of the console"
}
links: {
text: "customize"
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
alt: "Customize this console"
}
}
tree_status_host: "chromium-status.appspot.com"
luci.console_view(
name = 'chromium.swarm',
header = '//dev/consoles/chromium-header.textpb',
repo = 'https://chromium.googlesource.com/chromium/src',
entries = [
luci.console_view_entry(builder = 'ci/Android N5 Swarm'),
luci.console_view_entry(builder = 'ci/Android N5X Swarm'),
luci.console_view_entry(builder = 'ci/ChromeOS Swarm'),
luci.console_view_entry(builder = 'ci/Linux Swarm'),
luci.console_view_entry(builder = 'ci/Mac Swarm'),
luci.console_view_entry(builder = 'ci/Windows Swarm'),
],
)
luci.list_view(
name = 'snapshots',
title = 'Snapshot Builder',
entries = [
'cron/Snapshot Builder',
'cron/Snapshots',
],
)
logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
headers: {
id: "chromium"
oncalls: {
name: "Chromium"
url: "https://build.chromium.org/p/chromium/sheriff.json"
}
oncalls: {
name: "Android"
url: "https://build.chromium.org/p/chromium/sheriff_android.json"
}
oncalls: {
name: "iOS"
url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
}
oncalls: {
name: "CrOS MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_mtv.json"
}
oncalls: {
name: "CrOS non-MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_nonmtv.json"
}
oncalls: {
name: "ChromeOS Gardener"
url: "https://build.chromium.org/p/chromium/sheriff_cr_cros_gardeners.json"
}
oncalls: {
name: "GPU"
url: "https://build.chromium.org/p/chromium/sheriff_gpu.json"
}
oncalls: {
name: "Angle"
url: "https://build.chromium.org/p/chromium/sheriff_angle.json"
}
oncalls: {
name: "Perf"
url: "https://build.chromium.org/p/chromium/sheriff_perf.json"
}
oncalls: {
name: "Perfbot"
url: "https://build.chromium.org/p/chromium/sheriff_perfbot.json"
}
oncalls: {
name: "V8"
url: "https://build.chromium.org/p/chromium/sheriff_v8.json"
}
oncalls: {
name: "Trooper"
url: "https://build.chromium.org/p/chromium/trooper.json"
}
links: {
name: "Builds"
links: {
text: "continuous"
url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
alt: "Continuous browser snapshots"
}
links: {
text: "symbols"
url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
alt: "Windows Symbols"
}
links: {
text: "status"
url: "https://chromium-status.appspot.com/"
alt: "Current tree status"
}
}
links: {
name: "Dashboards"
links: {
text: "perf"
url: "https://chromeperf.appspot.com/"
alt: "Chrome perf dashboard"
}
links {
text: "flake-portal"
url: "https://analysis.chromium.org/p/chromium/flake-portal"
alt: "New flake portal"
}
links {
text: "legacy-flakiness"
url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
alt: "Legacy flakiness dashboard"
}
}
links: {
name: "Chromium"
links: {
text: "source"
url: "https://chromium.googlesource.com/chromium/src"
alt: "Chromium source code repository"
}
links: {
text: "reviews"
url: "https://chromium-review.googlesource.com"
alt: "Chromium code review tool"
}
links: {
text: "bugs"
url: "https://crbug.com"
alt: "Chromium bug tracker"
}
links: {
text: "dev"
url: "https://dev.chromium.org/Home"
alt: "Chromium developer home page"
}
links: {
text: "support"
url: "https://support.google.com/chrome/#topic=7438008"
alt: "Google Chrome help center"
}
}
links: {
name: "Consoles"
links: {
text: "swarm"
url: "/p/chromium/g/chromium.swarm"
alt: "Chromium Swarm console"
}
links: {
text: "prod"
url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
alt: "Main luci-milo console"
}
}
# Auto-generated by lucicfg.
# Do not modify manually.
#
# For the schema of this file, see Project message:
# https://luci-config.appspot.com/schemas/projects:luci-milo.cfg
links: {
name: "Navigate"
links: {
text: "about"
url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
alt: "Tour of the console"
}
links: {
text: "customize"
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
alt: "Customize this console"
}
}
tree_status_host: "chromium-status.appspot.com"
}
consoles {
header_id: "chromium"
consoles: <
id: "chromium.swarm"
name: "chromium.swarm"
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "refs/heads/master"
refs: "regexp:refs/heads/master"
manifest_name: "REVISION"
builders {
builders: <
name: "buildbucket/luci.chromium.ci/Android N5 Swarm"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.ci/Android N5X Swarm"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.ci/ChromeOS Swarm"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.ci/Linux Swarm"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.ci/Mac Swarm"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.ci/Windows Swarm"
}
}
consoles {
>
header: <
oncalls: <
name: "Chromium"
url: "https://build.chromium.org/p/chromium/sheriff.json"
>
oncalls: <
name: "Android"
url: "https://build.chromium.org/p/chromium/sheriff_android.json"
>
oncalls: <
name: "iOS"
url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
>
oncalls: <
name: "CrOS MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_mtv.json"
>
oncalls: <
name: "CrOS non-MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_nonmtv.json"
>
oncalls: <
name: "ChromeOS Gardener"
url: "https://build.chromium.org/p/chromium/sheriff_cr_cros_gardeners.json"
>
oncalls: <
name: "GPU"
url: "https://build.chromium.org/p/chromium/sheriff_gpu.json"
>
oncalls: <
name: "Angle"
url: "https://build.chromium.org/p/chromium/sheriff_angle.json"
>
oncalls: <
name: "Perf"
url: "https://build.chromium.org/p/chromium/sheriff_perf.json"
>
oncalls: <
name: "Perfbot"
url: "https://build.chromium.org/p/chromium/sheriff_perfbot.json"
>
oncalls: <
name: "V8"
url: "https://build.chromium.org/p/chromium/sheriff_v8.json"
>
oncalls: <
name: "Trooper"
url: "https://build.chromium.org/p/chromium/trooper.json"
>
links: <
name: "Builds"
links: <
text: "continuous"
url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
alt: "Continuous browser snapshots"
>
links: <
text: "symbols"
url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
alt: "Windows Symbols"
>
links: <
text: "status"
url: "https://chromium-status.appspot.com/"
alt: "Current tree status"
>
>
links: <
name: "Dashboards"
links: <
text: "perf"
url: "https://chromeperf.appspot.com/"
alt: "Chrome perf dashboard"
>
links: <
text: "flake-portal"
url: "https://analysis.chromium.org/p/chromium/flake-portal"
alt: "New flake portal"
>
links: <
text: "legacy-flakiness"
url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
alt: "Legacy flakiness dashboard"
>
>
links: <
name: "Chromium"
links: <
text: "source"
url: "https://chromium.googlesource.com/chromium/src"
alt: "Chromium source code repository"
>
links: <
text: "reviews"
url: "https://chromium-review.googlesource.com"
alt: "Chromium code review tool"
>
links: <
text: "bugs"
url: "https://crbug.com"
alt: "Chromium bug tracker"
>
links: <
text: "dev"
url: "https://dev.chromium.org/Home"
alt: "Chromium developer home page"
>
links: <
text: "support"
url: "https://support.google.com/chrome/#topic=7438008"
alt: "Google Chrome help center"
>
>
links: <
name: "Consoles"
links: <
text: "swarm"
url: "/p/chromium/g/chromium.swarm"
alt: "Chromium Swarm console"
>
links: <
text: "prod"
url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
alt: "Main luci-milo console"
>
>
links: <
name: "Navigate"
links: <
text: "about"
url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
alt: "Tour of the console"
>
links: <
text: "customize"
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
alt: "Customize this console"
>
>
tree_status_host: "chromium-status.appspot.com"
>
>
consoles: <
id: "snapshots"
builder_view_only: true
name: "Snapshot Builder"
builders {
builders: <
name: "buildbucket/luci.chromium.cron/Snapshot Builder"
}
builders {
>
builders: <
name: "buildbucket/luci.chromium.cron/Snapshots"
}
}
>
builder_view_only: true
>
logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/chromium.svg"
headers: {
id: "chromium"
oncalls: {
name: "Chromium"
url: "https://build.chromium.org/p/chromium/sheriff.json"
}
oncalls: {
name: "Android"
url: "https://build.chromium.org/p/chromium/sheriff_android.json"
}
oncalls: {
name: "iOS"
url: "https://build.chromium.org/p/chromium/sheriff_ios.json"
}
oncalls: {
name: "CrOS MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_mtv.json"
}
oncalls: {
name: "CrOS non-MTV"
url: "https://build.chromium.org/p/chromium/sheriff_cros_nonmtv.json"
}
oncalls: {
name: "ChromeOS Gardener"
url: "https://build.chromium.org/p/chromium/sheriff_cr_cros_gardeners.json"
}
oncalls: {
name: "GPU"
url: "https://build.chromium.org/p/chromium/sheriff_gpu.json"
}
oncalls: {
name: "Angle"
url: "https://build.chromium.org/p/chromium/sheriff_angle.json"
}
oncalls: {
name: "Perf"
url: "https://build.chromium.org/p/chromium/sheriff_perf.json"
}
oncalls: {
name: "Perfbot"
url: "https://build.chromium.org/p/chromium/sheriff_perfbot.json"
}
oncalls: {
name: "V8"
url: "https://build.chromium.org/p/chromium/sheriff_v8.json"
}
oncalls: {
name: "Trooper"
url: "https://build.chromium.org/p/chromium/trooper.json"
}
links: {
name: "Builds"
links: {
text: "continuous"
url: "https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html"
alt: "Continuous browser snapshots"
}
links: {
text: "symbols"
url: "https://www.chromium.org/developers/how-tos/debugging-on-windows"
alt: "Windows Symbols"
}
links: {
text: "status"
url: "https://chromium-status.appspot.com/"
alt: "Current tree status"
}
}
links: {
name: "Dashboards"
links: {
text: "perf"
url: "https://chromeperf.appspot.com/"
alt: "Chrome perf dashboard"
}
links {
text: "flake-portal"
url: "https://analysis.chromium.org/p/chromium/flake-portal"
alt: "New flake portal"
}
links {
text: "legacy-flakiness"
url: "https://test-results.appspot.com/dashboards/flakiness_dashboard.html"
alt: "Legacy flakiness dashboard"
}
}
links: {
name: "Chromium"
links: {
text: "source"
url: "https://chromium.googlesource.com/chromium/src"
alt: "Chromium source code repository"
}
links: {
text: "reviews"
url: "https://chromium-review.googlesource.com"
alt: "Chromium code review tool"
}
links: {
text: "bugs"
url: "https://crbug.com"
alt: "Chromium bug tracker"
}
links: {
text: "dev"
url: "https://dev.chromium.org/Home"
alt: "Chromium developer home page"
}
links: {
text: "support"
url: "https://support.google.com/chrome/#topic=7438008"
alt: "Google Chrome help center"
}
}
links: {
name: "Consoles"
links: {
text: "swarm"
url: "/p/chromium/g/chromium.swarm"
alt: "Chromium Swarm console"
}
links: {
text: "prod"
url: "https://luci-milo.appspot.com/p/chromium/g/main/console"
alt: "Main luci-milo console"
}
}
links: {
name: "Navigate"
links: {
text: "about"
url: "http://dev.chromium.org/developers/testing/chromium-build-infrastructure/tour-of-the-chromium-buildbot"
alt: "Tour of the console"
}
links: {
text: "customize"
url: "https://chromium.googlesource.com/chromium/src/+/master/infra/config/luci-milo-dev.cfg"
alt: "Customize this console"
}
}
tree_status_host: "chromium-status.appspot.com"
}
consoles {
header_id: "chromium"
id: "chromium.swarm"
name: "chromium.swarm"
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "refs/heads/master"
manifest_name: "REVISION"
builders {
name: "buildbucket/luci.chromium.ci/Android N5 Swarm"
}
builders {
name: "buildbucket/luci.chromium.ci/Android N5X Swarm"
}
builders {
name: "buildbucket/luci.chromium.ci/ChromeOS Swarm"
}
builders {
name: "buildbucket/luci.chromium.ci/Linux Swarm"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac Swarm"
}
builders {
name: "buildbucket/luci.chromium.ci/Windows Swarm"
}
}
consoles {
id: "snapshots"
builder_view_only: true
name: "Snapshot Builder"
builders {
name: "buildbucket/luci.chromium.cron/Snapshot Builder"
}
builders {
name: "buildbucket/luci.chromium.cron/Snapshots"
}
}
......@@ -1007,7 +1007,7 @@ class BBJSONGenerator(object):
'..', '..', 'infra', 'config'))
milo_configs = [
os.path.join(infra_config_dir, 'generated', 'luci-milo.cfg'),
os.path.join(infra_config_dir, 'luci-milo-dev.cfg'),
os.path.join(infra_config_dir, 'generated', 'luci-milo-dev.cfg'),
]
for c in milo_configs:
for l in self.read_file(c).splitlines():
......
......@@ -21,7 +21,8 @@ class FakeBBGen(generate_buildbot_json.BBJSONGenerator):
'infra', 'config'))
luci_milo_cfg_path = os.path.join(
infra_config_dir, 'generated', 'luci-milo.cfg')
luci_milo_dev_cfg_path = os.path.join(infra_config_dir, 'luci-milo-dev.cfg')
luci_milo_dev_cfg_path = os.path.join(
infra_config_dir, 'generated', 'luci-milo-dev.cfg')
self.files = {
'waterfalls.pyl': waterfalls,
'test_suites.pyl': test_suites,
......
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