[luci] Update active lucicfg experiments.
Remove retired noop experiments and add the one needed for the
ongoing luci-scheduler.cfg format migration.
R=ngeoffray
Change-Id: Ie0decc6ded5f2a0a415c2d1946f8f185419104ee
diff --git a/tools/luci/config/generated/cr-buildbucket.cfg b/tools/luci/config/generated/cr-buildbucket.cfg
index 8eddb51..36d660b 100644
--- a/tools/luci/config/generated/cr-buildbucket.cfg
+++ b/tools/luci/config/generated/cr-buildbucket.cfg
@@ -33,10 +33,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "angler-armv7-ndebug"
@@ -57,10 +53,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "angler-armv7-non-gen-cc"
@@ -81,10 +73,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "angler-armv8-debug"
@@ -105,10 +93,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "angler-armv8-ndebug"
@@ -129,10 +113,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "angler-armv8-non-gen-cc"
@@ -153,10 +133,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "bullhead-armv7-gcstress-ndebug"
@@ -177,10 +153,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "bullhead-armv8-gcstress-debug"
@@ -201,10 +173,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "bullhead-armv8-gcstress-ndebug"
@@ -225,10 +193,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "fugu-debug"
@@ -249,10 +213,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "fugu-ndebug"
@@ -273,10 +233,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86-cms"
@@ -297,10 +253,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86-debug"
@@ -321,10 +273,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86-gcstress-debug"
@@ -345,10 +293,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86-ndebug"
@@ -369,10 +313,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86-poison-debug"
@@ -393,10 +333,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-cdex-fast"
@@ -417,10 +353,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-cms"
@@ -441,10 +373,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-debug"
@@ -465,10 +393,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-ndebug"
@@ -489,10 +413,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-non-gen-cc"
@@ -513,10 +433,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "host-x86_64-poison-debug"
@@ -537,10 +453,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "walleye-armv7-poison-debug"
@@ -561,10 +473,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "walleye-armv8-poison-debug"
@@ -585,10 +493,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "walleye-armv8-poison-ndebug"
@@ -609,10 +513,6 @@
}
build_numbers: YES
service_account: "art-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
diff --git a/tools/luci/config/generated/luci-scheduler.cfg b/tools/luci/config/generated/luci-scheduler.cfg
index 5e07f37..d6c6ab5 100644
--- a/tools/luci/config/generated/luci-scheduler.cfg
+++ b/tools/luci/config/generated/luci-scheduler.cfg
@@ -10,6 +10,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv7-debug"
}
}
@@ -19,6 +20,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv7-ndebug"
}
}
@@ -28,6 +30,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv7-non-gen-cc"
}
}
@@ -37,6 +40,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv8-debug"
}
}
@@ -46,6 +50,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv8-ndebug"
}
}
@@ -55,6 +60,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "angler-armv8-non-gen-cc"
}
}
@@ -64,6 +70,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "bullhead-armv7-gcstress-ndebug"
}
}
@@ -73,6 +80,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "bullhead-armv8-gcstress-debug"
}
}
@@ -82,6 +90,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "bullhead-armv8-gcstress-ndebug"
}
}
@@ -91,6 +100,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "fugu-debug"
}
}
@@ -100,6 +110,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "fugu-ndebug"
}
}
@@ -109,6 +120,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86-cms"
}
}
@@ -118,6 +130,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86-debug"
}
}
@@ -127,6 +140,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86-gcstress-debug"
}
}
@@ -136,6 +150,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86-ndebug"
}
}
@@ -145,6 +160,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86-poison-debug"
}
}
@@ -154,6 +170,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-cdex-fast"
}
}
@@ -163,6 +180,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-cms"
}
}
@@ -172,6 +190,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-debug"
}
}
@@ -181,6 +200,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-ndebug"
}
}
@@ -190,6 +210,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-non-gen-cc"
}
}
@@ -199,6 +220,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "host-x86_64-poison-debug"
}
}
@@ -208,6 +230,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "walleye-armv7-poison-debug"
}
}
@@ -217,6 +240,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "walleye-armv8-poison-debug"
}
}
@@ -226,6 +250,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
+ bucket: "ci"
builder: "walleye-armv8-poison-ndebug"
}
}
diff --git a/tools/luci/config/generated/project.cfg b/tools/luci/config/generated/project.cfg
index 2270648..3593573 100644
--- a/tools/luci/config/generated/project.cfg
+++ b/tools/luci/config/generated/project.cfg
@@ -6,3 +6,10 @@
name: "art"
access: "group:all"
+lucicfg {
+ version: "1.30.9"
+ package_dir: ".."
+ config_dir: "generated"
+ entry_point: "main.star"
+ experiments: "crbug.com/1182002"
+}
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 79eb4df..714d652 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -20,17 +20,11 @@
After modifying this file execute it ('./main.star') to regenerate the configs.
"""
-lucicfg.check_version("1.24.4", "Please update depot_tools")
+lucicfg.check_version("1.30.9", "Please update depot_tools")
-# Enable v2 bucket names in LUCI Scheduler config.
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
lucicfg.enable_experiment("crbug.com/1182002")
-# Enable LUCI Security Realms.
-lucicfg.enable_experiment("crbug.com/1085650")
-
-# Launch 0% of Builds in "Realms-aware mode"
-luci.builder.defaults.experiments.set({"luci.use_realms": 100})
-
# Tell lucicfg what files it is allowed to touch.
lucicfg.config(
config_dir = "generated",