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:1273555
Change-Id: I5004b6cfe27584f43f10325bf43464e758802f2f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/71221
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
diff --git a/infra/config/global/generated/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg
index 3a4e486..732cf74 100644
--- a/infra/config/global/generated/cr-buildbucket.cfg
+++ b/infra/config/global/generated/cr-buildbucket.cfg
@@ -31,10 +31,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-dbg-x64"
@@ -56,10 +52,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-dbg-x86"
@@ -81,10 +73,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-rel-x64"
@@ -106,10 +94,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-rel-x86"
@@ -131,16 +115,12 @@
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: "dawn"
@@ -160,16 +140,12 @@
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: "dawn"
@@ -189,10 +165,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-dbg-x64"
@@ -218,10 +190,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-dbg-x86"
@@ -247,10 +215,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-rel-x64"
@@ -276,10 +240,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-rel-x86"
@@ -305,10 +265,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-msvc-dbg-x64"
@@ -329,10 +285,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-msvc-rel-x64"
@@ -353,10 +305,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
@@ -395,10 +343,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-dbg-x86"
@@ -421,10 +365,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-rel-x64"
@@ -447,10 +387,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "linux-clang-rel-x86"
@@ -473,16 +409,12 @@
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: "dawn"
@@ -503,16 +435,12 @@
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: "dawn"
@@ -533,10 +461,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "presubmit"
@@ -557,10 +481,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-dbg-x64"
@@ -587,10 +507,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-dbg-x86"
@@ -617,10 +533,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-rel-x64"
@@ -647,10 +559,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-clang-rel-x86"
@@ -677,10 +585,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-msvc-dbg-x64"
@@ -702,10 +606,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win-msvc-rel-x64"
@@ -727,10 +627,6 @@
key: "luci.recipes.use_python3"
value: 100
}
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 4d04895..79430cc 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,7 +7,7 @@
name: "dawn"
access: "group:all"
lucicfg {
- version: "1.30.1"
+ version: "1.30.4"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index 609d207..32f59f8 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -8,10 +8,7 @@
main.star: lucicfg configuration for Dawn'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,
})
@@ -113,7 +110,7 @@
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"),
)
