[infra] Update active lucicfg experiments.
Remove retired noop experiments and add the one needed for the
ongoing luci-scheduler.cfg format migration.
Change-Id: I8af7107251f97fcf54867d5a1624a9c59daa1466
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/12920
Reviewed-by: Petr Hosek <phosek@google.com>
Commit-Queue: Petr Hosek <phosek@google.com>
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index fdfd16c..98bdf26 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -23,10 +23,6 @@
}
execution_timeout_secs: 3600
service_account: "gn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "mac"
@@ -45,10 +41,6 @@
path: "macos_sdk"
}
service_account: "gn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win"
@@ -67,10 +59,6 @@
path: "windows_sdk"
}
service_account: "gn-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
@@ -101,10 +89,6 @@
}
execution_timeout_secs: 3600
service_account: "gn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "mac"
@@ -123,10 +107,6 @@
path: "macos_sdk"
}
service_account: "gn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
builders {
name: "win"
@@ -145,10 +125,6 @@
path: "windows_sdk"
}
service_account: "gn-try-builder@chops-service-accounts.iam.gserviceaccount.com"
- experiments {
- key: "luci.use_realms"
- value: 100
- }
}
}
}
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 1ba26bf..a3ff24d 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -10,7 +10,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
- bucket: "luci.gn.ci"
+ bucket: "ci"
builder: "linux"
}
}
@@ -20,7 +20,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
- bucket: "luci.gn.ci"
+ bucket: "ci"
builder: "mac"
}
}
@@ -30,7 +30,7 @@
acl_sets: "ci"
buildbucket {
server: "cr-buildbucket.appspot.com"
- bucket: "luci.gn.ci"
+ bucket: "ci"
builder: "win"
}
}
diff --git a/infra/config/generated/project.cfg b/infra/config/generated/project.cfg
index 0ac6951..8680f97 100644
--- a/infra/config/generated/project.cfg
+++ b/infra/config/generated/project.cfg
@@ -6,3 +6,10 @@
name: "gn"
access: "group:all"
+lucicfg {
+ version: "1.30.9"
+ package_dir: ".."
+ config_dir: "generated"
+ entry_point: "main.star"
+ experiments: "crbug.com/1182002"
+}
diff --git a/infra/config/main.star b/infra/config/main.star
index 2762024..d440d03 100755
--- a/infra/config/main.star
+++ b/infra/config/main.star
@@ -1,10 +1,9 @@
#!/usr/bin/env lucicfg
-lucicfg.check_version("1.23.3", "Please update depot_tools")
+lucicfg.check_version("1.30.9", "Please update depot_tools")
-# Enable LUCI Realms support and launch all builds in realms-aware mode.
-lucicfg.enable_experiment("crbug.com/1085650")
-luci.builder.defaults.experiments.set({"luci.use_realms": 100})
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
+lucicfg.enable_experiment("crbug.com/1182002")
lucicfg.config(
config_dir = "generated",
