Skip to content

GitLab

T
tangled
Commit 8b86b2d8 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Switch the branch main consoles to use main_console_view. 

Bug: 1067057
Change-Id: Ib8d60aa02fac5d278069541555a4e615ab5237bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142584
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarAaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758251}
parent a953f0a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 921 additions and 1081 deletions
infra/config/consoles/main.star deleted 100644 → 0
View file @ a953f0a4
exec('//versioned/milestones/m80/consoles/main.star')
exec('//versioned/milestones/m81/consoles/main.star')
exec('//versioned/milestones/m83/consoles/main.star')
infra/config/generated/luci-milo.cfg
View file @ 8b86b2d8
This diff is collapsed.
infra/config/main.star
View file @ 8b86b2d8
......@@ -113,7 +113,6 @@ exec('//consoles/findit.star')
exec('//consoles/goma.latest.star')
exec('//consoles/luci.chromium.goma.star')
exec('//consoles/luci.chromium.try.star')
exec('//consoles/main.star')
exec('//consoles/sheriff.ios.star')
exec('//consoles/try-m80.star')
exec('//consoles/try-m81.star')
......
infra/config/versioned/milestones/m80/buckets/ci.star
View file @ 8b86b2d8
......@@ -31,9 +31,37 @@ luci.gitiles_poller(
refs = [vars.ref],
)
ci.main_console_view(
name = vars.main_console_name,
header = '//consoles/chromium-header.textpb',
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [vars.ref],
title = vars.main_console_title,
top_level_ordering = [
'chromium',
'chromium.win',
'chromium.mac',
'chromium.linux',
'chromium.chromiumos',
'chromium.android',
'chrome',
'chromium.memory',
'chromium.dawn',
'chromium.gpu',
'chromium.fyi',
'chromium.android.fyi',
'chromium.clang',
'chromium.fuzz',
'chromium.gpu.fyi',
'chromium.swangle',
],
)
ci.defaults.add_to_console_view.set(vars.is_master)
ci.defaults.bucket.set(vars.ci_bucket)
ci.defaults.bucketed_triggers.set(True)
ci.defaults.main_console_view.set(vars.main_console_name)
ci.defaults.triggered_by.set([vars.ci_poller])
......@@ -43,19 +71,35 @@ ci.defaults.triggered_by.set([vars.ci_poller])
ci.android_builder(
name = 'android-kitkat-arm-rel',
console_view_entry = ci.console_view_entry(
category = 'on_cq',
short_name = 'K',
),
)
ci.android_builder(
name = 'android-marshmallow-arm64-rel',
console_view_entry = ci.console_view_entry(
category = 'on_cq',
short_name = 'M',
),
)
ci.chromiumos_builder(
name = 'chromeos-amd64-generic-rel',
console_view_entry = ci.console_view_entry(
category = 'simple|release|x64',
short_name = 'rel',
),
)
ci.chromiumos_builder(
name = 'linux-chromeos-rel',
console_view_entry = ci.console_view_entry(
category = 'default',
short_name = 'rel',
),
)
......@@ -63,6 +107,10 @@ ci.chromiumos_builder(
# OS shouldn't matter.
ci.fyi_builder(
name = 'mac-osxbeta-rel',
console_view_entry = ci.console_view_entry(
category = 'mac',
short_name = 'beta',
),
goma_backend = None,
triggered_by = [builder_name('Mac Builder')],
)
......@@ -70,22 +118,34 @@ ci.fyi_builder(
ci.fyi_windows_builder(
name = 'Win10 Tests x64 1803',
os = os.WINDOWS_10,
console_view_entry = ci.console_view_entry(
category = 'win10|1803',
),
goma_backend = None,
os = os.WINDOWS_10,
triggered_by = [builder_name('Win x64 Builder')],
)
ci.gpu_builder(
name = 'Android Release (Nexus 5X)',
console_view_entry = ci.console_view_entry(
category = 'Android',
),
)
ci.gpu_builder(
name = 'GPU Linux Builder',
console_view_entry = ci.console_view_entry(
category = 'Linux',
),
)
ci.gpu_builder(
name = 'GPU Mac Builder',
console_view_entry = ci.console_view_entry(
category = 'Mac',
),
cores = None,
os = os.MAC_ANY,
)
......@@ -93,59 +153,101 @@ ci.gpu_builder(
ci.gpu_builder(
name = 'GPU Win x64 Builder',
builderless = True,
console_view_entry = ci.console_view_entry(
category = 'Windows',
),
os = os.WINDOWS_ANY,
)
ci.gpu_thin_tester(
name = 'Linux Release (NVIDIA)',
console_view_entry = ci.console_view_entry(
category = 'Linux',
),
triggered_by = [builder_name('GPU Linux Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Release (Intel)',
console_view_entry = ci.console_view_entry(
category = 'Mac',
),
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Mac Retina Release (AMD)',
console_view_entry = ci.console_view_entry(
category = 'Mac',
),
triggered_by = [builder_name('GPU Mac Builder')],
)
ci.gpu_thin_tester(
name = 'Win10 x64 Release (NVIDIA)',
console_view_entry = ci.console_view_entry(
category = 'Windows',
),
triggered_by = [builder_name('GPU Win x64 Builder')],
)
ci.linux_builder(
name = 'Linux Builder',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'bld',
),
)
ci.linux_builder(
name = 'Linux Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'tst',
),
goma_backend = None,
triggered_by = [builder_name('Linux Builder')],
)
ci.linux_builder(
name = 'linux-ozone-rel',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'ozo',
),
)
ci.linux_builder(
name = 'Linux Ozone Tester (Headless)',
console_view = 'chromium.fyi',
console_view_entry = ci.console_view_entry(
category = 'linux',
short_name = 'loh',
),
goma_backend = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
ci.linux_builder(
name = 'Linux Ozone Tester (Wayland)',
console_view = 'chromium.fyi',
console_view_entry = ci.console_view_entry(
category = 'linux',
short_name = 'low',
),
goma_backend = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
ci.linux_builder(
name = 'Linux Ozone Tester (X11)',
console_view = 'chromium.fyi',
console_view_entry = ci.console_view_entry(
category = 'linux',
short_name = 'lox',
),
goma_backend = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
......@@ -153,41 +255,69 @@ ci.linux_builder(
ci.mac_builder(
name = 'Mac Builder',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'bld',
),
os = os.MAC_10_14,
)
# The build runs on 10.13, but triggers tests on 10.10 bots.
ci.mac_builder(
name = 'Mac10.10 Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '10',
),
triggered_by = [builder_name('Mac Builder')],
)
# The build runs on 10.13, but triggers tests on 10.11 bots.
ci.mac_builder(
name = 'Mac10.11 Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '11',
),
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.12 Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '12',
),
os = os.MAC_10_12,
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.13 Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '13',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'Mac10.14 Tests',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = '14',
),
os = os.MAC_10_14,
triggered_by = [builder_name('Mac Builder')],
)
ci.mac_builder(
name = 'WebKit Mac10.13 (retina)',
console_view_entry = ci.console_view_entry(
category = 'release',
short_name = 'ret',
),
os = os.MAC_10_13,
triggered_by = [builder_name('Mac Builder')],
)
......@@ -195,23 +325,40 @@ ci.mac_builder(
ci.mac_ios_builder(
name = 'ios-simulator',
console_view_entry = ci.console_view_entry(
category = 'ios|default',
short_name = 'sim',
),
goma_backend = None,
)
ci.win_builder(
name = 'Win 7 Tests x64 (1)',
console_view_entry = ci.console_view_entry(
category = 'release|tester',
short_name = '64',
),
os = os.WINDOWS_7,
triggered_by = [builder_name('Win x64 Builder')],
)
ci.win_builder(
name = 'Win x64 Builder',
console_view_entry = ci.console_view_entry(
category = 'release|builder',
short_name = '64',
),
cores = 32,
os = os.WINDOWS_ANY,
)
ci.win_builder(
name = 'Win10 Tests x64',
console_view_entry = ci.console_view_entry(
category = 'release|tester',
short_name = 'w10',
),
triggered_by = [builder_name('Win x64 Builder')],
)
infra/config/versioned/milestones/m80/consoles/main.star deleted 100644 → 0
View file @ a953f0a4
load('//lib/builders.star', 'builder_name', 'defaults')
load('../vars.star', 'vars')
defaults.bucket.set(vars.ci_bucket)
# TODO(https://crbug.com/922150) Add to chromium header
luci.console_view(
name = vars.main_console_name,
header = '//consoles/chromium-header.textpb',
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [vars.ref],
title = vars.main_console_title,
entries = [
luci.console_view_entry(
builder = builder_name('Linux Builder'),
category = 'chromium.linux|release',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (Headless)'),
category = 'linux',
short_name = 'loh',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (Wayland)'),
category = 'linux',
short_name = 'low',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (X11)'),
category = 'linux',
short_name = 'lox',
),
luci.console_view_entry(
builder = builder_name('Linux Tests'),
category = 'chromium.linux|release',
short_name = 'tst',
),
luci.console_view_entry(
builder = builder_name('linux-chromeos-rel'),
category = 'chromium.chromiumos|default',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('linux-ozone-rel'),
category = 'chromium.linux|release',
short_name = 'ozo',
),
luci.console_view_entry(
builder = builder_name('chromeos-amd64-generic-rel'),
category = 'chromium.chromiumos|simple|release|x64',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('Mac Builder'),
category = 'chromium.mac|release',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Mac10.10 Tests'),
category = 'chromium.mac|release',
short_name = '10',
),
luci.console_view_entry(
builder = builder_name('Mac10.11 Tests'),
category = 'chromium.mac|release',
short_name = '11',
),
luci.console_view_entry(
builder = builder_name('Mac10.12 Tests'),
category = 'chromium.mac|release',
short_name = '12',
),
luci.console_view_entry(
builder = builder_name('Mac10.13 Tests'),
category = 'chromium.mac|release',
short_name = '13',
),
luci.console_view_entry(
builder = builder_name('Mac10.14 Tests'),
category = 'chromium.mac|release',
short_name = '14',
),
luci.console_view_entry(
builder = builder_name('WebKit Mac10.13 (retina)'),
category = 'chromium.mac|release',
short_name = 'ret',
),
luci.console_view_entry(
builder = builder_name('ios-simulator'),
category = 'chromium.mac|ios|default',
short_name = 'sim',
),
luci.console_view_entry(
builder = builder_name('Win x64 Builder'),
category = 'chromium.win|release|builder',
short_name = '64',
),
luci.console_view_entry(
builder = builder_name('Win 7 Tests x64 (1)'),
category = 'chromium.win|release|tester',
short_name = '64',
),
luci.console_view_entry(
builder = builder_name('Win10 Tests x64'),
category = 'chromium.win|release|tester',
short_name = 'w10',
),
# TODO(https://crbug.com/922150) Add the following builders to the main
# console or don't have them be mirrored by main waterfall trybots
luci.console_view_entry(
builder = builder_name('android-kitkat-arm-rel'),
category = 'chromium.android',
short_name = 'k',
),
luci.console_view_entry(
builder = builder_name('android-marshmallow-arm64-rel'),
category = 'chromium.android',
short_name = 'm',
),
luci.console_view_entry(
builder = builder_name('mac-osxbeta-rel'),
category = 'chromium.fyi|mac',
short_name = 'osxbeta',
),
luci.console_view_entry(
builder = builder_name('Win10 Tests x64 1803'),
category = 'chromium.fyi|win10|1803',
),
luci.console_view_entry(
builder = builder_name('Android Release (Nexus 5X)'),
category = 'chromium.gpu|android',
),
luci.console_view_entry(
builder = builder_name('GPU Linux Builder'),
category = 'chromium.gpu|linux',
),
luci.console_view_entry(
builder = builder_name('Linux Release (NVIDIA)'),
category = 'chromium.gpu|linux',
),
luci.console_view_entry(
builder = builder_name('GPU Mac Builder'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('Mac Release (Intel)'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('Mac Retina Release (AMD)'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('GPU Win x64 Builder'),
category = 'chromium.gpu|win',
),
luci.console_view_entry(
builder = builder_name('Win10 x64 Release (NVIDIA)'),
category = 'chromium.gpu|win',
),
],
)
infra/config/versioned/milestones/m80/vars.star
View file @ 8b86b2d8
vars = struct(
is_master = False,
ref = 'refs/branch-heads/3987',
ci_bucket = 'ci-m80',
ci_poller = 'm80-gitiles-trigger',
main_console_name = 'main-m80',
main_console_title = 'Chromium M80 Console',
try_bucket = 'try-m80',
cq_group = 'cq-m80',
cq_ref_regexp = 'refs/branch-heads/3987',
main_console_name = 'main-m80',
main_console_title = 'Chromium M80 Console',
)
infra/config/versioned/milestones/m81/consoles/main.star deleted 100644 → 0
View file @ a953f0a4
load('//lib/builders.star', 'builder_name', 'defaults')
load('../vars.star', 'vars')
defaults.bucket.set(vars.ci_bucket)
# TODO(https://crbug.com/922150) Add to chromium header
luci.console_view(
name = vars.main_console_name,
header = '//consoles/chromium-header.textpb',
repo = 'https://chromium.googlesource.com/chromium/src',
refs = [vars.ref],
title = vars.main_console_title,
entries = [
luci.console_view_entry(
builder = builder_name('Linux Builder'),
category = 'chromium.linux|release',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (Headless)'),
category = 'linux',
short_name = 'loh',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (Wayland)'),
category = 'linux',
short_name = 'low',
),
luci.console_view_entry(
builder = builder_name('Linux Ozone Tester (X11)'),
category = 'linux',
short_name = 'lox',
),
luci.console_view_entry(
builder = builder_name('Linux Tests'),
category = 'chromium.linux|release',
short_name = 'tst',
),
luci.console_view_entry(
builder = builder_name('linux-ozone-rel'),
category = 'chromium.linux|release',
short_name = 'ozo',
),
luci.console_view_entry(
builder = builder_name('Cast Linux'),
category = 'chromium.linux|cast',
short_name = 'vid',
),
luci.console_view_entry(
builder = builder_name('Fuchsia ARM64'),
category = 'chromium.linux|fuchsia|a64',
),
luci.console_view_entry(
builder = builder_name('Fuchsia x64'),
category = 'chromium.linux|fuchsia|x64',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('linux-chromeos-rel'),
category = 'chromium.chromiumos|default',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('linux-chromeos-dbg'),
category = 'chromium.chromiumos|default',
short_name = 'dbg',
),
luci.console_view_entry(
builder = builder_name('chromeos-arm-generic-rel'),
category = 'chromium.chromiumos|simple|release',
short_name = 'arm',
),
luci.console_view_entry(
builder = builder_name('chromeos-amd64-generic-rel'),
category = 'chromium.chromiumos|simple|release|x64',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('Mac Builder'),
category = 'chromium.mac|release',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Mac10.10 Tests'),
category = 'chromium.mac|release',
short_name = '10',
),
luci.console_view_entry(
builder = builder_name('Mac10.11 Tests'),
category = 'chromium.mac|release',
short_name = '11',
),
luci.console_view_entry(
builder = builder_name('Mac10.12 Tests'),
category = 'chromium.mac|release',
short_name = '12',
),
luci.console_view_entry(
builder = builder_name('Mac10.13 Tests'),
category = 'chromium.mac|release',
short_name = '13',
),
luci.console_view_entry(
builder = builder_name('Mac10.14 Tests'),
category = 'chromium.mac|release',
short_name = '14',
),
luci.console_view_entry(
builder = builder_name('WebKit Mac10.13 (retina)'),
category = 'chromium.mac|release',
short_name = 'ret',
),
luci.console_view_entry(
builder = builder_name('Mac Builder (dbg)'),
category = 'chromium.mac|debug',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Mac10.13 Tests (dbg)'),
category = 'chromium.mac|debug',
short_name = '13',
),
luci.console_view_entry(
builder = builder_name('ios-simulator'),
category = 'chromium.mac|ios|default',
short_name = 'sim',
),
luci.console_view_entry(
builder = builder_name('Win x64 Builder'),
category = 'chromium.win|release|builder',
short_name = '64',
),
luci.console_view_entry(
builder = builder_name('Win 7 Tests x64 (1)'),
category = 'chromium.win|release|tester',
short_name = '64',
),
luci.console_view_entry(
builder = builder_name('Win10 Tests x64'),
category = 'chromium.win|release|tester',
short_name = 'w10',
),
luci.console_view_entry(
builder = builder_name('Win Builder (dbg)'),
category = 'chromium.win|debug|builder',
short_name = '32',
),
luci.console_view_entry(
builder = builder_name('Win7 Tests (dbg)(1)'),
category = 'chromium.win|debug|tester',
short_name = '7',
),
luci.console_view_entry(
builder = builder_name('Linux ASan LSan Builder'),
category = 'chromium.memory|linux|asan lsan',
short_name = 'bld',
),
luci.console_view_entry(
builder = builder_name('Linux ASan LSan Tests (1)'),
category = 'chromium.memory|linux|asan lsan',
short_name = 'tst',
),
luci.console_view_entry(
builder = builder_name('Linux ASan Tests (sandboxed)'),
category = 'chromium.memory|linux|asan lsan',
short_name = 'sbx',
),
# TODO(https://crbug.com/922150) Add the following builders to the main
# console or don't have them be mirrored by main waterfall trybots
luci.console_view_entry(
builder = builder_name('android-kitkat-arm-rel'),
category = 'chromium.android',
short_name = 'k',
),
luci.console_view_entry(
builder = builder_name('android-marshmallow-arm64-rel'),
category = 'chromium.android',
short_name = 'm',
),
luci.console_view_entry(
builder = builder_name('Cast Android (dbg)'),
category = 'chromium.android',
short_name = 'cst',
),
luci.console_view_entry(
builder = builder_name('Android arm Builder (dbg)'),
category = 'chromium.android|builder|arm',
short_name = '32',
),
luci.console_view_entry(
builder = builder_name('android-cronet-arm-rel'),
category = 'chromium.android|cronet|arm',
short_name = 'rel',
),
luci.console_view_entry(
builder = builder_name('android-cronet-kitkat-arm-rel'),
category = 'chromium.android|cronet|test',
short_name = 'k',
),
luci.console_view_entry(
builder = builder_name('android-cronet-lollipop-arm-rel'),
category = 'chromium.android|cronet|test',
short_name = 'l',
),
luci.console_view_entry(
builder = builder_name('mac-osxbeta-rel'),
category = 'chromium.fyi|mac',
short_name = 'osxbeta',
),
luci.console_view_entry(
builder = builder_name('Win10 Tests x64 1803'),
category = 'chromium.fyi|win10|1803',
),
luci.console_view_entry(
builder = builder_name('Android Release (Nexus 5X)'),
category = 'chromium.gpu|android',
),
luci.console_view_entry(
builder = builder_name('GPU Linux Builder'),
category = 'chromium.gpu|linux',
),
luci.console_view_entry(
builder = builder_name('Linux Release (NVIDIA)'),
category = 'chromium.gpu|linux',
),
luci.console_view_entry(
builder = builder_name('GPU Mac Builder'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('Mac Release (Intel)'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('Mac Retina Release (AMD)'),
category = 'chromium.gpu|mac',
),
luci.console_view_entry(
builder = builder_name('GPU Win x64 Builder'),
category = 'chromium.gpu|win',
),
luci.console_view_entry(
builder = builder_name('Win10 x64 Release (NVIDIA)'),
category = 'chromium.gpu|win',
),
],
)
infra/config/versioned/milestones/m81/vars.star
View file @ 8b86b2d8
vars = struct(
is_master = False,
ref = 'refs/branch-heads/4044',
ci_bucket = 'ci-m81',
ci_poller = 'm81-gitiles-trigger',
main_console_name = 'main-m81',
main_console_title = 'Chromium M81 Console',
try_bucket = 'try-m81',
cq_group = 'cq-m81',
cq_ref_regexp = 'refs/branch-heads/4044',
main_console_name = 'main-m81',
main_console_title = 'Chromium M81 Console',
)
infra/config/versioned/milestones/m83/vars.star
View file @ 8b86b2d8
vars = struct(
is_master = False,
ref = 'refs/branch-heads/4103',
ci_bucket = 'ci-m83',
ci_poller = 'm83-gitiles-trigger',
main_console_name = 'main-m83',
main_console_title = 'Chromium M83 Console',
try_bucket = 'try-m83',
cq_group = 'cq-m83',
cq_ref_regexp = 'refs/branch-heads/4103',
main_console_name = 'main-m83',
main_console_title = 'Chromium M83 Console',
)
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