Commit 229a7c61 authored by Garrett Beaty's avatar Garrett Beaty Committed by Commit Bot

Switch the builder group for mojo builders.

The recipe-side config for the mojo builders has already been copied to
the new builder group.

Bug: 1131163
Change-Id: Id1d01ccdac7f242e347db02586b04bb6927b9e0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427123
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#809869}
parent 1b749a28
...@@ -5685,7 +5685,7 @@ buckets { ...@@ -5685,7 +5685,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -5714,7 +5714,7 @@ buckets { ...@@ -5714,7 +5714,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -5743,7 +5743,7 @@ buckets { ...@@ -5743,7 +5743,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -5771,7 +5771,7 @@ buckets { ...@@ -5771,7 +5771,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -8947,7 +8947,7 @@ buckets { ...@@ -8947,7 +8947,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -11553,7 +11553,7 @@ buckets { ...@@ -11553,7 +11553,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}" properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.mojo\",\"recipe\":\"chromium\"}"
execution_timeout_secs: 36000 execution_timeout_secs: 36000
build_numbers: YES build_numbers: YES
service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com" service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
...@@ -6729,36 +6729,6 @@ consoles { ...@@ -6729,36 +6729,6 @@ consoles {
category: "linux|blink" category: "linux|blink"
short_name: "VF" short_name: "VF"
} }
builders {
name: "buildbucket/luci.chromium.ci/Mojo Android"
category: "mojo"
short_name: "and"
}
builders {
name: "buildbucket/luci.chromium.ci/android-mojo-webview-rel"
category: "mojo"
short_name: "aw"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo ChromiumOS"
category: "mojo"
short_name: "cr"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo Linux"
category: "mojo"
short_name: "lnx"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
category: "mojo"
short_name: "mac"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo Windows"
category: "mojo"
short_name: "win"
}
builders { builders {
name: "buildbucket/luci.chromium.ci/linux-chromium-tests-staging-builder" name: "buildbucket/luci.chromium.ci/linux-chromium-tests-staging-builder"
category: "recipe|staging|linux" category: "recipe|staging|linux"
...@@ -10028,6 +9998,300 @@ consoles { ...@@ -10028,6 +9998,300 @@ consoles {
tree_status_host: "chromium-status.appspot.com" tree_status_host: "chromium-status.appspot.com"
} }
} }
consoles {
id: "chromium.mojo"
name: "chromium.mojo"
repo_url: "https://chromium.googlesource.com/chromium/src"
refs: "regexp:refs/heads/master"
manifest_name: "REVISION"
builders {
name: "buildbucket/luci.chromium.ci/Mojo Android"
short_name: "and"
}
builders {
name: "buildbucket/luci.chromium.ci/android-mojo-webview-rel"
short_name: "aw"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo ChromiumOS"
short_name: "cr"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo Linux"
short_name: "lnx"
}
builders {
name: "buildbucket/luci.chromium.ci/mac-mojo-rel"
short_name: "mac"
}
builders {
name: "buildbucket/luci.chromium.ci/Mojo Windows"
short_name: "win"
}
header {
oncalls {
name: "Chromium"
url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-build-sheriff"
}
oncalls {
name: "Android"
url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-android-sheriff"
}
oncalls {
name: "iOS"
url: "https://rota-ng.appspot.com/legacy/sheriff_ios.json"
}
oncalls {
name: "GPU"
url: "https://rota-ng.appspot.com/legacy/sheriff_gpu.json"
}
oncalls {
name: "Angle"
url: "https://rota-ng.appspot.com/legacy/sheriff_angle.json"
}
oncalls {
name: "Perf"
url: "https://rota-ng.appspot.com/legacy/sheriff_perf.json"
}
oncalls {
name: "Perfbot"
url: "https://rota-ng.appspot.com/legacy/sheriff_perfbot.json"
}
oncalls {
name: "Trooper"
url: "https://chrome-ops-rotation-proxy.appspot.com/current/oncallator:chrome-ops-client-infra"
show_primary_secondary_labels: true
}
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: "coverage"
url: "https://analysis.chromium.org/p/chromium/coverage"
alt: "Chromium code coverage dashboard"
}
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: "android"
url: "/p/chromium/g/chromium.android"
alt: "Chromium Android console"
}
links {
text: "clang"
url: "/p/chromium/g/chromium.clang"
alt: "Chromium Clang console"
}
links {
text: "dawn"
url: "/p/chromium/g/chromium.dawn"
alt: "Chromium Dawn console"
}
links {
text: "fuzz"
url: "/p/chromium/g/chromium.fuzz"
alt: "Chromium Fuzz console"
}
links {
text: "fyi"
url: "/p/chromium/g/chromium.fyi"
alt: "Chromium FYI console"
}
links {
text: "gpu"
url: "/p/chromium/g/chromium.gpu"
alt: "Chromium GPU console"
}
links {
text: "perf"
url: "/p/chrome/g/chrome.perf/console"
alt: "Chromium Perf console"
}
links {
text: "perf.fyi"
url: "/p/chrome/g/chrome.perf.fyi/console"
alt: "Chromium Perf FYI console"
}
links {
text: "swangle"
url: "/p/chromium/g/chromium.swangle"
alt: "Chromium SWANGLE console"
}
links {
text: "webrtc"
url: "/p/chromium/g/chromium.webrtc"
alt: "Chromium WebRTC console"
}
links {
text: "chromiumos"
url: "/p/chromium/g/chromium.chromiumos"
alt: "ChromiumOS console"
}
}
links {
name: "Branch Consoles"
links {
text: "m86"
url: "/p/chromium-m86/g/main/console"
alt: "Beta branch console"
}
links {
text: "m85"
url: "/p/chromium/g/main-m85/console"
alt: "Stable branch console"
}
links {
text: "trunk"
url: "/p/chromium/g/main/console"
alt: "Trunk (ToT) console"
}
}
links {
name: "Tryservers"
links {
text: "android"
url: "/p/chromium/g/tryserver.chromium.android/builders"
alt: "Android"
}
links {
text: "angle"
url: "/p/chromium/g/tryserver.chromium.angle/builders"
alt: "Angle"
}
links {
text: "blink"
url: "/p/chromium/g/tryserver.blink/builders"
alt: "Blink"
}
links {
text: "chrome"
url: "/p/chrome/g/tryserver.chrome/builders"
alt: "Chrome"
}
links {
text: "chromiumos"
url: "/p/chromium/g/tryserver.chromium.chromiumos/builders"
alt: "ChromiumOS"
}
links {
text: "linux"
url: "/p/chromium/g/tryserver.chromium.linux/builders"
alt: "Linux"
}
links {
text: "mac"
url: "/p/chromium/g/tryserver.chromium.mac/builders"
alt: "Mac"
}
links {
text: "swangle"
url: "/p/chromium/g/tryserver.chromium.swangle/builders"
alt: "SWANGLE"
}
links {
text: "win"
url: "/p/chromium/g/tryserver.chromium.win/builders"
alt: "Win"
}
}
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.cfg"
alt: "Customize this console"
}
}
console_groups {
title {
text: "Tree Closers"
url: "https://chromium-status.appspot.com/"
}
console_ids: "chromium/chromium"
console_ids: "chromium/chromium.win"
console_ids: "chromium/chromium.mac"
console_ids: "chromium/chromium.linux"
console_ids: "chromium/chromium.chromiumos"
console_ids: "chrome/chrome"
console_ids: "chromium/chromium.memory"
console_ids: "chromium/chromium.gpu"
}
console_groups {
console_ids: "chromium/chromium.android"
console_ids: "chrome/chrome.perf"
console_ids: "chromium/chromium.gpu.fyi"
console_ids: "chromium/chromium.swangle"
console_ids: "chromium/chromium.fuzz"
}
tree_status_host: "chromium-status.appspot.com"
}
}
consoles { consoles {
id: "chromium.swangle" id: "chromium.swangle"
name: "chromium.swangle" name: "chromium.swangle"
......
...@@ -899,6 +899,20 @@ def memory_builder( ...@@ -899,6 +899,20 @@ def memory_builder(
**kwargs **kwargs
) )
def mojo_builder(
*,
name,
execution_timeout = 10 * time.hour,
goma_backend = builders.goma.backend.RBE_PROD,
**kwargs):
return ci.builder(
name = name,
builder_group = "chromium.mojo",
execution_timeout = execution_timeout,
goma_backend = goma_backend,
**kwargs
)
def swangle_builder(*, name, builderless = True, pinned = True, **kwargs): def swangle_builder(*, name, builderless = True, pinned = True, **kwargs):
builder_args = dict(kwargs) builder_args = dict(kwargs)
builder_args.update( builder_args.update(
...@@ -1012,6 +1026,7 @@ ci = struct( ...@@ -1012,6 +1026,7 @@ ci = struct(
mac_builder = mac_builder, mac_builder = mac_builder,
mac_ios_builder = mac_ios_builder, mac_ios_builder = mac_ios_builder,
memory_builder = memory_builder, memory_builder = memory_builder,
mojo_builder = mojo_builder,
swangle_linux_builder = swangle_linux_builder, swangle_linux_builder = swangle_linux_builder,
swangle_mac_builder = swangle_mac_builder, swangle_mac_builder = swangle_mac_builder,
swangle_windows_builder = swangle_windows_builder, swangle_windows_builder = swangle_windows_builder,
......
...@@ -122,7 +122,6 @@ ci.console_view( ...@@ -122,7 +122,6 @@ ci.console_view(
"chromeos", "chromeos",
"iOS", "iOS",
"linux", "linux",
"mojo",
"recipe", "recipe",
"remote_run", "remote_run",
"site_isolation", "site_isolation",
...@@ -245,6 +244,10 @@ ci.console_view( ...@@ -245,6 +244,10 @@ ci.console_view(
}, },
) )
ci.console_view(
name = "chromium.mojo",
)
ci.console_view( ci.console_view(
name = "chromium.swangle", name = "chromium.swangle",
ordering = { ordering = {
...@@ -2235,30 +2238,6 @@ ci.fyi_builder( ...@@ -2235,30 +2238,6 @@ ci.fyi_builder(
triggered_by = ["Linux remote_run Builder"], triggered_by = ["Linux remote_run Builder"],
) )
ci.fyi_builder(
name = "Mojo Android",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "and",
),
)
ci.fyi_builder(
name = "Mojo ChromiumOS",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "cr",
),
)
ci.fyi_builder(
name = "Mojo Linux",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "lnx",
),
)
ci.fyi_builder( ci.fyi_builder(
name = "Site Isolation Android", name = "Site Isolation Android",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
...@@ -2277,14 +2256,6 @@ ci.fyi_builder( ...@@ -2277,14 +2256,6 @@ ci.fyi_builder(
main_console_view = main_console_if_on_branch(), main_console_view = main_console_if_on_branch(),
) )
ci.fyi_builder(
name = "android-mojo-webview-rel",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "aw",
),
)
ci.fyi_builder( ci.fyi_builder(
name = "chromeos-amd64-generic-lacros-rel", name = "chromeos-amd64-generic-lacros-rel",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
...@@ -2952,15 +2923,6 @@ ci.fyi_mac_builder( ...@@ -2952,15 +2923,6 @@ ci.fyi_mac_builder(
cores = 8, cores = 8,
) )
ci.fyi_mac_builder(
name = "mac-mojo-rel",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "mac",
),
os = os.MAC_ANY,
)
ci.fyi_windows_builder( ci.fyi_windows_builder(
name = "Win10 Tests x64 1803", name = "Win10 Tests x64 1803",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
...@@ -3012,14 +2974,6 @@ ci.fyi_windows_builder( ...@@ -3012,14 +2974,6 @@ ci.fyi_windows_builder(
notifies = ["annotator-rel"], notifies = ["annotator-rel"],
) )
ci.fyi_windows_builder(
name = "Mojo Windows",
console_view_entry = ci.console_view_entry(
category = "mojo",
short_name = "win",
),
)
ci.gpu_builder( ci.gpu_builder(
name = "Android Release (Nexus 5X)", name = "Android Release (Nexus 5X)",
branch_selector = branches.STANDARD_RELEASES, branch_selector = branches.STANDARD_RELEASES,
...@@ -4612,6 +4566,52 @@ ci.memory_builder( ...@@ -4612,6 +4566,52 @@ ci.memory_builder(
os = os.WINDOWS_DEFAULT, os = os.WINDOWS_DEFAULT,
) )
ci.mojo_builder(
name = "Mojo Android",
console_view_entry = ci.console_view_entry(
short_name = "and",
),
)
ci.mojo_builder(
name = "Mojo ChromiumOS",
console_view_entry = ci.console_view_entry(
short_name = "cr",
),
)
ci.mojo_builder(
name = "Mojo Linux",
console_view_entry = ci.console_view_entry(
short_name = "lnx",
),
)
ci.mojo_builder(
name = "Mojo Windows",
builderless = False,
console_view_entry = ci.console_view_entry(
short_name = "win",
),
os = os.WINDOWS_DEFAULT,
)
ci.mojo_builder(
name = "android-mojo-webview-rel",
console_view_entry = ci.console_view_entry(
short_name = "aw",
),
)
ci.mojo_builder(
name = "mac-mojo-rel",
console_view_entry = ci.console_view_entry(
short_name = "mac",
),
cores = 4,
os = os.MAC_ANY,
)
ci.swangle_linux_builder( ci.swangle_linux_builder(
name = "linux-swangle-chromium-x64", name = "linux-swangle-chromium-x64",
console_view_entry = ci.console_view_entry( console_view_entry = ci.console_view_entry(
......
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