Update manually generated configs These configs match the output of the new Starlark generated configs that are being worked on. Landing these in advance to a) confirm that they working, and b) make the patch using Starlark a no-op from the config contents perspective. BUG=tint:693 Change-Id: I82a85405097ae2e595c87f658027eddaa75e21a9 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/51400 Auto-Submit: Ryan Harrison <rharrison@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: Jamie Madill <jmadill@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
diff --git a/infra/config/global/commit-queue.cfg b/infra/config/global/commit-queue.cfg index f8a7bb6..fff3ec7 100644 --- a/infra/config/global/commit-queue.cfg +++ b/infra/config/global/commit-queue.cfg
@@ -37,6 +37,9 @@ name: "tint/try/linux-clang-rel-x64" } builders { + name: "tint/try/linux-clang-rel-x86" + } + builders { name: "tint/try/mac-dbg" } builders { @@ -51,6 +54,15 @@ builders { name: "tint/try/win-clang-rel-x64" } + builders { + name: "tint/try/win-clang-rel-x86" + } + builders { + name: "tint/try/win-msvc-dbg-x64" + } + builders { + name: "tint/try/win-msvc-rel-x64" + } retry_config { single_quota: 1
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg index 66b70ee..22354e0 100644 --- a/infra/config/global/cr-buildbucket.cfg +++ b/infra/config/global/cr-buildbucket.cfg
@@ -95,6 +95,10 @@ } EOF } + caches { + path: "win_toolchain" + name: "win_toolchain" + } } builder_mixins { name: "mac" @@ -128,10 +132,6 @@ dimensions: "pool:luci.flex.ci" # We have 32bit test configurations but some of our toolchain is 64bit (like CIPD) dimensions: "cpu:x86-64" - caches { - path: "win_toolchain" - name: "win_toolchain" - } recipe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/master" @@ -144,24 +144,28 @@ builders { name: "linux-clang-dbg-x64" mixins: "linux" + mixins: "clang" mixins: "debug" mixins: "x64" } builders { name: "linux-clang-dbg-x86" mixins: "linux" + mixins: "clang" mixins: "debug" mixins: "x86" } builders { name: "linux-clang-rel-x64" mixins: "linux" + mixins: "clang" mixins: "release" mixins: "x64" } builders { name: "linux-clang-rel-x86" mixins: "linux" + mixins: "clang" mixins: "release" mixins: "x86" } @@ -170,12 +174,16 @@ builders { name: "mac-dbg" mixins: "mac" + mixins: "clang" mixins: "debug" + mixins: "x64" } builders { name: "mac-rel" mixins: "mac" + mixins: "clang" mixins: "release" + mixins: "x64" } # Windows: test combinations of {clang,msvc}x{release,debug}x{x86,x64} @@ -216,6 +224,10 @@ mixins: "no_clang" mixins: "debug" mixins: "x64" + caches { + path: "win_toolchain" + name: "win_toolchain" + } } builders { name: "win-msvc-rel-x64" @@ -223,6 +235,10 @@ mixins: "no_clang" mixins: "release" mixins: "x64" + caches { + path: "win_toolchain" + name: "win_toolchain" + } } } } @@ -238,10 +254,6 @@ dimensions: "pool:luci.flex.try" # We have 32bit test configurations but some of our toolchain is 64bit (like CIPD) dimensions: "cpu:x86-64" - caches { - path: "win_toolchain" - name: "win_toolchain" - } recipe { cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build" cipd_version: "refs/heads/master" @@ -269,6 +281,7 @@ builders { name: "linux-clang-dbg-x64" mixins: "linux" + mixins: "clang" mixins: "debug" mixins: "x64" } @@ -276,6 +289,7 @@ builders { name: "linux-clang-dbg-x86" mixins: "linux" + mixins: "clang" mixins: "debug" mixins: "x86" } @@ -283,6 +297,7 @@ builders { name: "linux-clang-rel-x64" mixins: "linux" + mixins: "clang" mixins: "release" mixins: "x64" } @@ -290,6 +305,7 @@ builders { name: "linux-clang-rel-x86" mixins: "linux" + mixins: "clang" mixins: "release" mixins: "x86" } @@ -298,13 +314,17 @@ builders { name: "mac-dbg" mixins: "mac" + mixins: "clang" mixins: "debug" + mixins: "x64" } # Actually on the CQ builders { name: "mac-rel" mixins: "mac" + mixins: "clang" mixins: "release" + mixins: "x64" } # Actually on the CQ @@ -348,6 +368,10 @@ mixins: "no_clang" mixins: "debug" mixins: "x64" + caches { + path: "win_toolchain" + name: "win_toolchain" + } } # CI Mirror only builders { @@ -356,6 +380,10 @@ mixins: "no_clang" mixins: "release" mixins: "x64" + caches { + path: "win_toolchain" + name: "win_toolchain" + } } } }
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg index 7f5a18f..159f726 100644 --- a/infra/config/global/luci-milo.cfg +++ b/infra/config/global/luci-milo.cfg
@@ -1,102 +1,110 @@ -consoles { +consoles: < id: "ci" name: "Tint CI Builders" repo_url: "https://dawn.googlesource.com/tint" - refs: "refs/heads/main" - manifest_name: "REVISION" - - builders { + refs: "regexp:refs/heads/main" + builders: < name: "buildbucket/luci.tint.ci/linux-clang-dbg-x64" category: "linux|clang|dbg" short_name: "x64" - } - builders { - name: "buildbucket/luci.tint.ci/linux-clang-dbg-x86" - category: "linux|clang|dbg" - short_name: "x86" - } - builders { + > + builders: < name: "buildbucket/luci.tint.ci/linux-clang-rel-x64" category: "linux|clang|rel" short_name: "x64" - } - builders { + > + builders: < + name: "buildbucket/luci.tint.ci/linux-clang-dbg-x86" + category: "linux|clang|dbg" + short_name: "x86" + > + builders: < name: "buildbucket/luci.tint.ci/linux-clang-rel-x86" category: "linux|clang|rel" short_name: "x86" - } - - builders { + > + builders: < name: "buildbucket/luci.tint.ci/mac-dbg" category: "mac" short_name: "dbg" - } - builders { + > + builders: < name: "buildbucket/luci.tint.ci/mac-rel" category: "mac" short_name: "rel" - } - - builders { + > + builders: < name: "buildbucket/luci.tint.ci/win-clang-dbg-x64" category: "win|clang|dbg" short_name: "x64" - } - builders { - name: "buildbucket/luci.tint.ci/win-clang-dbg-x86" - category: "win|clang|dbg" - short_name: "x86" - } - builders { + > + builders: < name: "buildbucket/luci.tint.ci/win-clang-rel-x64" category: "win|clang|rel" short_name: "x64" - } - builders { + > + builders: < + name: "buildbucket/luci.tint.ci/win-clang-dbg-x86" + category: "win|clang|dbg" + short_name: "x86" + > + builders: < name: "buildbucket/luci.tint.ci/win-clang-rel-x86" category: "win|clang|rel" short_name: "x86" - } - builders { + > + builders: < name: "buildbucket/luci.tint.ci/win-msvc-dbg-x64" category: "win|msvc" short_name: "dbg" - } - builders { + > + builders: < name: "buildbucket/luci.tint.ci/win-msvc-rel-x64" category: "win|msvc" short_name: "rel" - } -} - -consoles { + > +> +consoles: < id: "try" name: "Tint try Builders" - manifest_name: "PATCHED" - builder_view_only: true - - builders { + builders: < name: "buildbucket/luci.tint.try/presubmit" - } - - builders { + > + builders: < name: "buildbucket/luci.tint.try/linux-clang-dbg-x64" - } - builders { + > + builders: < name: "buildbucket/luci.tint.try/linux-clang-rel-x64" - } - - builders { + > + builders: < + name: "buildbucket/luci.tint.try/linux-clang-dbg-x86" + > + builders: < + name: "buildbucket/luci.tint.try/linux-clang-rel-x86" + > + builders: < name: "buildbucket/luci.tint.try/mac-dbg" - } - builders { + > + builders: < name: "buildbucket/luci.tint.try/mac-rel" - } - - builders { + > + builders: < name: "buildbucket/luci.tint.try/win-clang-dbg-x64" - } - builders { + > + builders: < name: "buildbucket/luci.tint.try/win-clang-rel-x64" - } -} + > + builders: < + name: "buildbucket/luci.tint.try/win-clang-dbg-x86" + > + builders: < + name: "buildbucket/luci.tint.try/win-clang-rel-x86" + > + builders: < + name: "buildbucket/luci.tint.try/win-msvc-dbg-x64" + > + builders: < + name: "buildbucket/luci.tint.try/win-msvc-rel-x64" + > + builder_view_only: true +>
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg index f8bddcb..5c9dd7c 100644 --- a/infra/config/global/luci-scheduler.cfg +++ b/infra/config/global/luci-scheduler.cfg
@@ -18,7 +18,7 @@ } trigger { - id: "master-gitiles-trigger" + id: "primary-poller" acl_sets: "default" gitiles { repo: "https://dawn.googlesource.com/tint.git"