Try #2: Update Mac version and remove stale experiment

Changing Mac version from 10.15 to 10.15|11

Also removes realms experiment, since it is no longer active and
lucicfg was emitting a warning about it.

BUG=chromium:1273569

Change-Id: I97308249c8cc21e677cbac9b34cd09aa4b471660
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/71220
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ryan Harrison 2021-11-29 21:08:09 +00:00 committed by Tint LUCI CQ
parent 8c30d752a0
commit 76fc6d61e9
3 changed files with 6 additions and 109 deletions

View File

@ -30,10 +30,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-dbg-x86"
@ -55,10 +51,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-rel-x64"
@ -80,10 +72,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-rel-x86"
@ -105,16 +93,12 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "mac-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.15"
dimensions: "os:Mac-10.15|Mac-11"
dimensions: "pool:luci.flex.ci"
recipe {
name: "tint"
@ -134,16 +118,12 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "mac-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.15"
dimensions: "os:Mac-10.15|Mac-11"
dimensions: "pool:luci.flex.ci"
recipe {
name: "tint"
@ -163,10 +143,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-dbg-x64"
@ -192,10 +168,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-dbg-x86"
@ -221,10 +193,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-rel-x64"
@ -250,10 +218,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-rel-x86"
@ -279,10 +243,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-msvc-dbg-x64"
@ -303,10 +263,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-msvc-rel-x64"
@ -327,10 +283,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
}
}
@ -369,10 +321,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-dbg-x86"
@ -395,10 +343,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-rel-x64"
@ -421,10 +365,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "linux-clang-rel-x86"
@ -447,16 +387,12 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "mac-dbg"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.15"
dimensions: "os:Mac-10.15|Mac-11"
dimensions: "pool:luci.flex.try"
recipe {
name: "tint"
@ -477,16 +413,12 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "mac-rel"
swarming_host: "chromium-swarm.appspot.com"
dimensions: "cpu:x86-64"
dimensions: "os:Mac-10.15"
dimensions: "os:Mac-10.15|Mac-11"
dimensions: "pool:luci.flex.try"
recipe {
name: "tint"
@ -507,10 +439,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "presubmit"
@ -531,10 +459,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-dbg-x64"
@ -561,10 +485,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-dbg-x86"
@ -591,10 +511,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-rel-x64"
@ -621,10 +537,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-clang-rel-x86"
@ -651,10 +563,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-msvc-dbg-x64"
@ -676,10 +584,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
builders {
name: "win-msvc-rel-x64"
@ -701,10 +605,6 @@ buckets {
key: "luci.recipes.use_python3"
value: 100
}
experiments {
key: "luci.use_realms"
value: 100
}
}
}
}

View File

@ -7,7 +7,7 @@
name: "tint"
access: "group:all"
lucicfg {
version: "1.30.1"
version: "1.30.4"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"

View File

@ -8,10 +8,7 @@
main.star: lucicfg configuration for Tint's standalone builers.
"""
# Enable realms experiment.
lucicfg.enable_experiment("crbug.com/1085650")
luci.builder.defaults.experiments.set({
"luci.use_realms": 100,
"luci.recipes.use_python3": 100,
})
@ -98,7 +95,7 @@ def os_enum(dimension, category, console_name):
os = struct(
LINUX = os_enum("Ubuntu-18.04", os_category.LINUX, "linux"),
MAC = os_enum("Mac-10.15", os_category.MAC, "mac"),
MAC = os_enum("Mac-10.15|Mac-11", os_category.MAC, "mac"),
WINDOWS = os_enum("Windows-10", os_category.WINDOWS, "win"),
UNKNOWN = os_enum("Unknown", os_category.UNKNOWN, "unknown"),
)