Skip to content

GitLab

T
tangled
Commit 6cc519be authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot
Browse files
Options

Make main console match more closely with sheriff responsibilities. 

Further adjustments may be required once branch sheriff responsibilities
are clarified and a more maintainable solution can be crafted.

Change-Id: I30df4e95e9d57c6b330f4d75af0e31c35500efa2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2243712
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777971}
parent 432f1dc8
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 68 deletions
infra/config/generated/luci-milo.cfg
View file @ 6cc519be
......@@ -10751,6 +10751,21 @@ consoles {
category: "chrome"
short_name: "win"
}
builders {
name: "buildbucket/luci.chromium.ci/win-asan"
category: "chromium.memory|win"
short_name: "asn"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac ASan 64 Builder"
category: "chromium.memory|mac"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Mac ASan 64 Tests (1)"
category: "chromium.memory|mac"
short_name: "tst"
}
builders {
name: "buildbucket/luci.chromium.ci/Linux TSan Builder"
category: "chromium.memory|linux|TSan v2"
......@@ -10777,64 +10792,59 @@ consoles {
short_name: "sbx"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Builder"
category: "chromium.dawn|DEPS|Linux|Builder"
short_name: "x64"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (Intel HD 630)"
category: "chromium.dawn|DEPS|Linux|Intel"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/Linux MSan Builder"
category: "chromium.memory|linux|msan"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Linux x64 DEPS Release (NVIDIA)"
category: "chromium.dawn|DEPS|Linux|Nvidia"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/Linux MSan Tests"
category: "chromium.memory|linux|msan"
short_name: "tst"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Builder"
category: "chromium.dawn|DEPS|Mac|Builder"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/WebKit Linux ASAN"
category: "chromium.memory|linux|webkit"
short_name: "asn"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (AMD)"
category: "chromium.dawn|DEPS|Mac|AMD"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/WebKit Linux MSAN"
category: "chromium.memory|linux|webkit"
short_name: "msn"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Mac x64 DEPS Release (Intel)"
category: "chromium.dawn|DEPS|Mac|Intel"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/WebKit Linux Leak"
category: "chromium.memory|linux|webkit"
short_name: "lk"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Builder"
category: "chromium.dawn|DEPS|Windows|Builder"
short_name: "x86"
name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Builder"
category: "chromium.memory|cros|asan"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Builder"
category: "chromium.dawn|DEPS|Windows|Builder"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/Linux Chromium OS ASan LSan Tests (1)"
category: "chromium.memory|cros|asan"
short_name: "tst"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (Intel HD 630)"
category: "chromium.dawn|DEPS|Windows|Intel"
short_name: "x86"
name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Builder"
category: "chromium.memory|cros|msan"
short_name: "bld"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (Intel HD 630)"
category: "chromium.dawn|DEPS|Windows|Intel"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/Linux ChromiumOS MSan Tests"
category: "chromium.memory|cros|msan"
short_name: "tst"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x86 DEPS Release (NVIDIA)"
category: "chromium.dawn|DEPS|Windows|Nvidia"
short_name: "x86"
name: "buildbucket/luci.chromium.ci/android-asan"
category: "chromium.memory|android"
short_name: "asn"
}
builders {
name: "buildbucket/luci.chromium.ci/Dawn Win10 x64 DEPS Release (NVIDIA)"
category: "chromium.dawn|DEPS|Windows|Nvidia"
short_name: "x64"
name: "buildbucket/luci.chromium.ci/Linux CFI"
category: "chromium.memory|cfi"
short_name: "lnx"
}
builders {
name: "buildbucket/luci.chromium.ci/GPU Win x64 Builder"
......@@ -10869,36 +10879,9 @@ consoles {
category: "chromium.gpu|Android"
}
builders {
name: "buildbucket/luci.chromium.ci/ios-simulator-cronet"
category: "chromium.fyi|cronet"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-osxbeta-rel"
category: "chromium.fyi|mac"
short_name: "beta"
}
builders {
name: "buildbucket/luci.chromium.ci/VR Linux"
category: "chromium.fyi|linux"
}
builders {
name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Headless)"
category: "chromium.fyi|linux"
short_name: "loh"
}
builders {
name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (Wayland)"
category: "chromium.fyi|linux"
short_name: "low"
}
builders {
name: "buildbucket/luci.chromium.ci/Linux Ozone Tester (X11)"
category: "chromium.fyi|linux"
short_name: "lox"
}
builders {
name: "buildbucket/luci.chromium.ci/Win10 Tests x64 1803"
category: "chromium.fyi|win10|1803"
name: "buildbucket/luci.chromium.ci/Android CFI"
category: "chromium.android.fyi|memory"
short_name: "cfi"
}
header {
oncalls {
......
infra/config/subprojects/chromium/ci.star
View file @ 6cc519be
......@@ -495,6 +495,7 @@ ci.dawn_builder(
category = 'DEPS|Linux|Builder',
short_name = 'x64',
),
main_console_view = None,
)
ci.dawn_builder(
......@@ -504,6 +505,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')],
)
......@@ -515,6 +517,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')],
)
......@@ -527,6 +530,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = None,
main_console_view = None,
os = os.MAC_ANY,
)
......@@ -539,6 +543,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')],
)
......@@ -550,6 +555,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')],
)
......@@ -560,6 +566,7 @@ ci.dawn_builder(
category = 'DEPS|Windows|Builder',
short_name = 'x64',
),
main_console_view = None,
os = os.WINDOWS_ANY,
)
......@@ -570,6 +577,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')],
)
......@@ -581,6 +589,7 @@ ci.dawn_builder(
short_name = 'x64',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')],
)
......@@ -591,6 +600,7 @@ ci.dawn_builder(
category = 'DEPS|Windows|Builder',
short_name = 'x86',
),
main_console_view = None,
os = os.WINDOWS_ANY,
)
......@@ -601,6 +611,7 @@ ci.dawn_builder(
short_name = 'x86',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')],
)
......@@ -612,6 +623,7 @@ ci.dawn_builder(
short_name = 'x86',
),
cores = 2,
main_console_view = None,
os = os.LINUX_DEFAULT,
triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')],
)
......@@ -622,6 +634,7 @@ ci.fyi_builder(
console_view_entry = ci.console_view_entry(
category = 'linux',
),
main_console_view = None,
)
# This is launching & collecting entirely isolated tests.
......@@ -633,6 +646,7 @@ ci.fyi_builder(
short_name = 'beta',
),
goma_backend = None,
main_console_view = None,
triggered_by = [builder_name('Mac Builder')],
)
......@@ -643,6 +657,7 @@ ci.fyi_ios_builder(
category = 'cronet',
),
executable = 'recipe:chromium',
main_console_view = None,
notifies = ['cronet'],
properties = {
'xcode_build_version': '11e146',
......@@ -656,6 +671,7 @@ ci.fyi_windows_builder(
category = 'win10|1803',
),
goma_backend = None,
main_console_view = None,
os = os.WINDOWS_10,
triggered_by = [builder_name('Win x64 Builder')],
)
......@@ -822,6 +838,7 @@ ci.linux_builder(
category = 'linux',
short_name = 'loh',
),
main_console_view = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
......@@ -832,6 +849,7 @@ ci.linux_builder(
category = 'linux',
short_name = 'low',
),
main_console_view = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
......@@ -842,6 +860,7 @@ ci.linux_builder(
category = 'linux',
short_name = 'lox',
),
main_console_view = None,
triggered_by = [builder_name('linux-ozone-rel')],
)
......
infra/config/subprojects/chromium/master-only/ci.star
View file @ 6cc519be
......@@ -2809,6 +2809,7 @@ ci.memory_builder(
# TODO(https://crbug.com/919430) Remove the larger timeout once compile
# times have been brought down to reasonable level
execution_timeout = time.hour * 9 / 2, # 4.5 (can't multiply float * duration)
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2821,6 +2822,7 @@ ci.memory_builder(
# TODO(thakis): Remove once https://crbug.com/927738 is resolved.
execution_timeout = 4 * time.hour,
goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2832,6 +2834,7 @@ ci.memory_builder(
# TODO(crbug.com/1030593): Builds take more than 3 hours sometimes. Remove
# once the builds are faster.
execution_timeout = 6 * time.hour,
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2841,6 +2844,7 @@ ci.memory_builder(
short_name = 'tst',
),
triggered_by = ['Linux Chromium OS ASan LSan Builder'],
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2849,6 +2853,7 @@ ci.memory_builder(
category = 'cros|msan',
short_name = 'bld',
),
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2858,6 +2863,7 @@ ci.memory_builder(
short_name = 'tst',
),
triggered_by = ['Linux ChromiumOS MSan Builder'],
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2867,6 +2873,7 @@ ci.memory_builder(
short_name = 'bld',
),
goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2876,6 +2883,7 @@ ci.memory_builder(
short_name = 'tst',
),
triggered_by = ['Linux MSan Builder'],
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2888,6 +2896,7 @@ ci.memory_builder(
goma_debug = True, # TODO(hinoka): Remove this after debugging.
goma_jobs = None,
cores = None, # Swapping between 8 and 24
main_console_view = 'main',
os = os.MAC_DEFAULT,
triggering_policy = scheduler.greedy_batching(
max_concurrent_invocations = 2,
......@@ -2901,6 +2910,7 @@ ci.memory_builder(
category = 'mac',
short_name = 'tst',
),
main_console_view = 'main',
os = os.MAC_DEFAULT,
triggered_by = ['Mac ASan 64 Builder'],
)
......@@ -2911,6 +2921,7 @@ ci.memory_builder(
category = 'linux|webkit',
short_name = 'asn',
),
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2919,6 +2930,7 @@ ci.memory_builder(
category = 'linux|webkit',
short_name = 'lk',
),
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2927,6 +2939,7 @@ ci.memory_builder(
category = 'linux|webkit',
short_name = 'msn',
),
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2935,6 +2948,7 @@ ci.memory_builder(
category = 'android',
short_name = 'asn',
),
main_console_view = 'main',
)
ci.memory_builder(
......@@ -2945,6 +2959,7 @@ ci.memory_builder(
),
cores = 32,
builderless = True,
main_console_view = 'main',
os = os.WINDOWS_DEFAULT,
)
......
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