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=dawn:734
Change-Id: Ifa8018cf88f0d9a6e025d3a2009e9f8ed84dd22d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/52980
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/infra/config/global/commit-queue.cfg b/infra/config/global/commit-queue.cfg
index 7ed5611..e61162d 100644
--- a/infra/config/global/commit-queue.cfg
+++ b/infra/config/global/commit-queue.cfg
@@ -1,79 +1,81 @@
-# See http://luci-config.appspot.com/schemas/projects:commit-queue.cfg for the
-# documentation of this file format.
-
cq_status_host: "chromium-cq-status.appspot.com"
-submit_options {
+submit_options: <
max_burst: 4
- burst_delay {
+ burst_delay: <
seconds: 480
- }
-}
-config_groups {
+ >
+>
+config_groups: <
name: "Dawn-CQ"
- gerrit {
+ gerrit: <
url: "https://dawn-review.googlesource.com"
- projects {
+ projects: <
name: "dawn"
ref_regexp: "refs/heads/.+"
- }
- }
- verifiers {
- gerrit_cq_ability {
+ >
+ >
+ verifiers: <
+ gerrit_cq_ability: <
committer_list: "project-dawn-committers"
dry_run_access_list: "project-dawn-tryjob-access"
- }
- tryjob {
- builders {
+ >
+ tryjob: <
+ builders: <
+ name: "chromium/try/linux-dawn-rel"
+ >
+ builders: <
+ name: "chromium/try/mac-dawn-rel"
+ >
+ builders: <
+ name: "chromium/try/win-dawn-rel"
+ >
+ builders: <
+ name: "dawn/try/linux-clang-dbg-x64"
+ >
+ builders: <
+ name: "dawn/try/linux-clang-dbg-x86"
+ >
+ builders: <
+ name: "dawn/try/linux-clang-rel-x64"
+ >
+ builders: <
+ name: "dawn/try/linux-clang-rel-x86"
+ >
+ builders: <
+ name: "dawn/try/mac-dbg"
+ >
+ builders: <
+ name: "dawn/try/mac-rel"
+ >
+ builders: <
name: "dawn/try/presubmit"
disable_reuse: true
- }
- builders {
- name: "dawn/try/linux-clang-dbg-x64"
- }
- builders {
- name: "dawn/try/linux-clang-dbg-x86"
- }
- builders {
- name: "dawn/try/linux-clang-rel-x64"
- }
- builders {
- name: "dawn/try/mac-dbg"
- }
- builders {
- name: "dawn/try/mac-rel"
- }
- builders {
+ >
+ builders: <
name: "dawn/try/win-clang-dbg-x64"
- }
- builders {
+ >
+ builders: <
name: "dawn/try/win-clang-dbg-x86"
- }
- builders {
+ >
+ builders: <
name: "dawn/try/win-clang-rel-x64"
- }
- builders {
+ >
+ builders: <
+ name: "dawn/try/win-clang-rel-x86"
+ >
+ builders: <
name: "dawn/try/win-msvc-dbg-x64"
- }
- builders {
+ >
+ builders: <
name: "dawn/try/win-msvc-rel-x64"
- }
- builders {
- name: "chromium/try/linux-dawn-rel"
- }
- builders {
- name: "chromium/try/mac-dawn-rel"
- }
- builders {
- name: "chromium/try/win-dawn-rel"
- }
-
- retry_config {
+ >
+ retry_config: <
single_quota: 1
global_quota: 2
failure_weight: 1
transient_failure_weight: 1
timeout_weight: 2
- }
- }
- }
-}
+ >
+ >
+ >
+>
diff --git a/infra/config/global/cr-buildbucket.cfg b/infra/config/global/cr-buildbucket.cfg
index 34a9c1a..e3c4a55 100644
--- a/infra/config/global/cr-buildbucket.cfg
+++ b/infra/config/global/cr-buildbucket.cfg
@@ -86,6 +86,10 @@
builder_mixins {
name: "windows",
dimensions: "os:Windows-10"
+ caches {
+ path: "win_toolchain"
+ name: "win_toolchain"
+ }
recipe {
properties_j: <<EOF
$build/goma: {
@@ -112,6 +116,7 @@
EOF
}
}
+
builder_mixins {
name: "gen_fuzz_corpus"
recipe {
@@ -129,10 +134,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"
@@ -145,24 +146,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"
}
@@ -171,12 +176,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}
@@ -229,6 +238,7 @@
builders {
name: "cron-linux-clang-rel-x64"
mixins: "linux"
+ mixins: "clang"
mixins: "release"
mixins: "x64"
mixins: "gen_fuzz_corpus"
@@ -247,10 +257,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"
@@ -278,6 +284,7 @@
builders {
name: "linux-clang-dbg-x64"
mixins: "linux"
+ mixins: "clang"
mixins: "debug"
mixins: "x64"
}
@@ -285,6 +292,7 @@
builders {
name: "linux-clang-dbg-x86"
mixins: "linux"
+ mixins: "clang"
mixins: "debug"
mixins: "x86"
}
@@ -292,6 +300,7 @@
builders {
name: "linux-clang-rel-x64"
mixins: "linux"
+ mixins: "clang"
mixins: "release"
mixins: "x64"
}
@@ -299,6 +308,7 @@
builders {
name: "linux-clang-rel-x86"
mixins: "linux"
+ mixins: "clang"
mixins: "release"
mixins: "x86"
}
@@ -306,14 +316,18 @@
# Actually on the CQ
builders {
name: "mac-dbg"
+ mixins: "clang"
mixins: "mac"
mixins: "debug"
+ mixins: "x64"
}
# Actually on the CQ
builders {
name: "mac-rel"
+ mixins: "clang"
mixins: "mac"
mixins: "release"
+ mixins: "x64"
}
# Actually on the CQ
diff --git a/infra/config/global/luci-milo.cfg b/infra/config/global/luci-milo.cfg
index acfd7e7..2e6ec0f 100644
--- a/infra/config/global/luci-milo.cfg
+++ b/infra/config/global/luci-milo.cfg
@@ -90,8 +90,14 @@
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"
@@ -104,6 +110,18 @@
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"
+ }
}
diff --git a/infra/config/global/luci-scheduler.cfg b/infra/config/global/luci-scheduler.cfg
index 9896b9c..1927e43 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/dawn.git"
@@ -151,7 +151,6 @@
job {
id: "cron-linux-clang-rel-x64"
- realm: "ci"
schedule: "0 0 0 * * * *"
acl_sets: "default"
buildbucket {
