Add standalone builders to views
Adds the experimental Dawn standalone builders to the existing
console/list views for CI and try builders.
Bug: 385317083
Change-Id: Ic353899d3a5272298b7ca33ebbc5067387b24d53
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/256336
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
diff --git a/infra/config/global/generated/builders/gn_args_locations.json b/infra/config/global/generated/builders/gn_args_locations.json
index 46cdbea..235212d 100644
--- a/infra/config/global/generated/builders/gn_args_locations.json
+++ b/infra/config/global/generated/builders/gn_args_locations.json
@@ -1,6 +1,8 @@
{
- "dawn": {
- "dawn-cq-linux-x64-sws-rel": "try/dawn-cq-linux-x64-sws-rel/gn-args.json",
+ "ci": {
"dawn-linux-x64-builder-rel": "ci/dawn-linux-x64-builder-rel/gn-args.json"
+ },
+ "try": {
+ "dawn-cq-linux-x64-sws-rel": "try/dawn-cq-linux-x64-sws-rel/gn-args.json"
}
}
\ No newline at end of file
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/luci/cr-buildbucket.cfg
index 8032ff8..1e31854 100644
--- a/infra/config/global/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/global/generated/luci/cr-buildbucket.cfg
@@ -907,7 +907,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "COMPILE_AND_TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -928,7 +928,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -967,7 +967,7 @@
' "mirroring_builder_group_and_names": ['
' {'
' "builder": "dawn-cq-linux-x64-sws-rel",'
- ' "group": "dawn"'
+ ' "group": "try"'
' }'
' ]'
' }'
@@ -984,7 +984,7 @@
' "project": "rbe-chromium-trusted",'
' "remote_jobs": 250'
' },'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "recipe": "dawn/gn_v2"'
'}'
build_numbers: YES
@@ -1079,7 +1079,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "COMPILE_AND_TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -1100,7 +1100,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -1132,12 +1132,12 @@
' "mirroring_builder_group_and_names": ['
' {'
' "builder": "dawn-cq-linux-x64-sws-rel",'
- ' "group": "dawn"'
+ ' "group": "try"'
' }'
' ]'
' }'
' },'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "recipe": "dawn/gn_v2"'
'}'
build_numbers: YES
@@ -2552,7 +2552,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "COMPILE_AND_TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -2573,7 +2573,7 @@
' "project": "dawn"'
' },'
' "builder_spec": {'
- ' "builder_group": "dawn",'
+ ' "builder_group": "ci",'
' "execution_mode": "TEST",'
' "legacy_chromium_config": {'
' "build_config": "Release",'
@@ -2623,7 +2623,7 @@
' "project": "rbe-chromium-untrusted",'
' "remote_jobs": 250'
' },'
- ' "builder_group": "dawn",'
+ ' "builder_group": "try",'
' "recipe": "dawn/gn_v2_trybot"'
'}'
build_numbers: YES
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci/luci-milo.cfg
index 8a1c89f..ba6a331 100644
--- a/infra/config/global/generated/luci/luci-milo.cfg
+++ b/infra/config/global/generated/luci/luci-milo.cfg
@@ -11,11 +11,36 @@
refs: "regexp:refs/heads/main"
manifest_name: "REVISION"
builders {
+ name: "buildbucket/luci.dawn.ci/cron-linux-clang-rel-x64"
+ category: "cron|linux|clang|rel"
+ short_name: "x64"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/cts-roller"
category: "cron|roll"
short_name: "cts"
}
builders {
+ name: "buildbucket/luci.dawn.ci/dawn-linux-x64-builder-rel"
+ category: "linux|build|clang|rel"
+ short_name: "x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64"
+ category: "linux|clang|dbg"
+ short_name: "x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64-asan"
+ category: "linux|clang|dbg"
+ short_name: "x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64-ubsan"
+ category: "linux|clang|dbg"
+ short_name: "x64"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/linux-clang-dbg-x64"
category: "linux|clang|dbg"
short_name: "x64"
@@ -26,6 +51,21 @@
short_name: "x86"
}
builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64"
+ category: "linux|clang|rel"
+ short_name: "x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64-asan"
+ category: "linux|clang|rel"
+ short_name: "x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64-ubsan"
+ category: "linux|clang|rel"
+ short_name: "x64"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/linux-clang-rel-x64"
category: "linux|clang|rel"
short_name: "x64"
@@ -36,11 +76,26 @@
short_name: "x86"
}
builders {
+ name: "buildbucket/luci.dawn.ci/dawn-linux-x64-sws-rel"
+ category: "linux|test|clang|rel|x64"
+ short_name: "sws"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.ci/cmake-mac-dbg"
+ category: "mac"
+ short_name: "dbg"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/mac-dbg"
category: "mac"
short_name: "dbg"
}
builders {
+ name: "buildbucket/luci.dawn.ci/cmake-mac-rel"
+ category: "mac"
+ short_name: "rel"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/mac-rel"
category: "mac"
short_name: "rel"
@@ -66,114 +121,30 @@
short_name: "x86"
}
builders {
- name: "buildbucket/luci.dawn.ci/win-msvc-dbg-x64"
- category: "win|msvc"
- short_name: "dbg"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/win-msvc-rel-x64"
- category: "win|msvc"
- short_name: "rel"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cron-linux-clang-rel-x64"
- category: "cron|linux|clang|rel"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64"
- category: "linux|clang|dbg"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64-asan"
- category: "linux|clang|dbg"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-dbg-x64-ubsan"
- category: "linux|clang|dbg"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64"
- category: "linux|clang|rel"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64-asan"
- category: "linux|clang|rel"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-linux-clang-rel-x64-ubsan"
- category: "linux|clang|rel"
- short_name: "x64"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-mac-dbg"
- category: "mac"
- short_name: "dbg"
- }
- builders {
- name: "buildbucket/luci.dawn.ci/cmake-mac-rel"
- category: "mac"
- short_name: "rel"
- }
- builders {
name: "buildbucket/luci.dawn.ci/cmake-win-msvc-dbg-x64"
category: "win|msvc"
short_name: "dbg"
}
builders {
+ name: "buildbucket/luci.dawn.ci/win-msvc-dbg-x64"
+ category: "win|msvc"
+ short_name: "dbg"
+ }
+ builders {
name: "buildbucket/luci.dawn.ci/cmake-win-msvc-rel-x64"
category: "win|msvc"
short_name: "rel"
}
+ builders {
+ name: "buildbucket/luci.dawn.ci/win-msvc-rel-x64"
+ category: "win|msvc"
+ short_name: "rel"
+ }
}
consoles {
id: "try"
name: "Dawn try Builders"
builders {
- name: "buildbucket/luci.dawn.try/presubmit"
- }
- builders {
- name: "buildbucket/luci.dawn.try/linux-clang-dbg-x64"
- }
- builders {
- name: "buildbucket/luci.dawn.try/linux-clang-dbg-x86"
- }
- builders {
- name: "buildbucket/luci.dawn.try/linux-clang-rel-x64"
- }
- builders {
- name: "buildbucket/luci.dawn.try/linux-clang-rel-x86"
- }
- builders {
- name: "buildbucket/luci.dawn.try/mac-dbg"
- }
- builders {
- name: "buildbucket/luci.dawn.try/mac-rel"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-clang-dbg-x64"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-clang-dbg-x86"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-clang-rel-x64"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-clang-rel-x86"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-msvc-dbg-x64"
- }
- builders {
- name: "buildbucket/luci.dawn.try/win-msvc-rel-x64"
- }
- builders {
name: "buildbucket/luci.dawn.try/cmake-linux-clang-dbg-x64"
}
builders {
@@ -206,6 +177,45 @@
builders {
name: "buildbucket/luci.dawn.try/dawn-cq-linux-x64-sws-rel"
}
+ builders {
+ name: "buildbucket/luci.dawn.try/linux-clang-dbg-x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/linux-clang-dbg-x86"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/linux-clang-rel-x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/linux-clang-rel-x86"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/mac-dbg"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/mac-rel"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/presubmit"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-clang-dbg-x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-clang-dbg-x86"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-clang-rel-x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-clang-rel-x86"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-msvc-dbg-x64"
+ }
+ builders {
+ name: "buildbucket/luci.dawn.try/win-msvc-rel-x64"
+ }
builder_view_only: true
}
logo_url: "https://storage.googleapis.com/chrome-infra-public/logo/dawn-logo.png"
diff --git a/infra/config/global/gn_standalone_ci.star b/infra/config/global/gn_standalone_ci.star
index b0795e4..257449b 100644
--- a/infra/config/global/gn_standalone_ci.star
+++ b/infra/config/global/gn_standalone_ci.star
@@ -30,12 +30,13 @@
load("@chromium-luci//builder_config.star", "builder_config")
load("@chromium-luci//builders.star", "os")
load("@chromium-luci//ci.star", "ci")
+load("@chromium-luci//consoles.star", "consoles")
load("@chromium-luci//gn_args.star", "gn_args")
load("//constants.star", "siso")
ci.defaults.set(
executable = "recipe:dawn/gn_v2",
- builder_group = "dawn",
+ builder_group = "ci",
bucket = "ci",
pool = "luci.chromium.gpu.ci",
build_numbers = True,
@@ -82,6 +83,10 @@
),
cores = 8,
os = os.LINUX_DEFAULT,
+ console_view_entry = consoles.console_view_entry(
+ category = "linux|build|clang|rel",
+ short_name = "x64",
+ ),
)
ci.thin_tester(
@@ -102,4 +107,8 @@
),
run_tests_serially = True,
),
+ console_view_entry = consoles.console_view_entry(
+ category = "linux|test|clang|rel|x64",
+ short_name = "sws",
+ ),
)
diff --git a/infra/config/global/gn_standalone_try.star b/infra/config/global/gn_standalone_try.star
index ffb4201..1874583 100644
--- a/infra/config/global/gn_standalone_try.star
+++ b/infra/config/global/gn_standalone_try.star
@@ -33,7 +33,7 @@
try_.defaults.set(
executable = "recipe:dawn/gn_v2_trybot",
- builder_group = "dawn",
+ builder_group = "try",
bucket = "try",
pool = "luci.chromium.gpu.try",
builderless = True,
diff --git a/infra/config/global/legacy_builders.star b/infra/config/global/legacy_builders.star
index e460c21..15c5cbe 100644
--- a/infra/config/global/legacy_builders.star
+++ b/infra/config/global/legacy_builders.star
@@ -722,24 +722,6 @@
)
_add_branch_verifiers("dawn-chromium-presubmit", "linux", min_milestone = 130, disable_reuse = True)
-# Views
-
-luci.milo(
- logo = "https://storage.googleapis.com/chrome-infra-public/logo/dawn-logo.png",
-)
-
-luci.console_view(
- name = "ci",
- title = "Dawn CI Builders",
- repo = "https://dawn.googlesource.com/dawn",
- refs = ["refs/heads/main"],
-)
-
-luci.list_view(
- name = "try",
- title = "Dawn try Builders",
-)
-
# CQ
luci.cq(
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 26273a4..ff1ef08 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -33,6 +33,7 @@
load("@chromium-luci//builders.star", "os")
load("@chromium-luci//chromium_luci.star", "chromium_luci")
+load("@chromium-luci//consoles.star", "consoles")
# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
lucicfg.enable_experiment("crbug.com/1182002")
@@ -118,7 +119,6 @@
)
chromium_luci.configure_ci(
- main_console_view = "main",
test_results_bq_dataset_name = "chromium",
resultdb_index_by_timestamp = True,
)
@@ -263,6 +263,24 @@
dynamic = True,
)
+# Views
+
+luci.milo(
+ logo = "https://storage.googleapis.com/chrome-infra-public/logo/dawn-logo.png",
+)
+
+consoles.console_view(
+ name = "ci",
+ title = "Dawn CI Builders",
+ repo = "https://dawn.googlesource.com/dawn",
+ refs = ["refs/heads/main"],
+)
+
+consoles.list_view(
+ name = "try",
+ title = "Dawn try Builders",
+)
+
# Run other non-builder setup.
exec("//recipes.star")
exec("//gn_args.star")
