From 3ce05348e7a227d5953aad8692e07c420e94af6f Mon Sep 17 00:00:00 2001
From: Vadim Shtayura <vadimsh@google.com>
Date: Thu, 10 Feb 2022 18:42:18 +0000
Subject: [PATCH] Generate shorter bucket names in luci-scheduler.cfg.

This is an ongoing LUCI config format migration.

R=jrprice@google.com

Change-Id: I12c2913b61f97ea1a4108ac9e5cc0b46f0be3765
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/79960
Auto-Submit: Vadim Shtayura <vadimsh@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison (use @chromium.org) <rharrison@google.com>
Commit-Queue: Ryan Harrison (use @chromium.org) <rharrison@google.com>
---
 .../global/generated/luci-scheduler.cfg       | 24 +++++++++----------
 infra/config/global/generated/project.cfg     |  3 ++-
 infra/config/global/main.star                 |  3 +++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/infra/config/global/generated/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg
index b58acab952..ccdeef0ed9 100644
--- a/infra/config/global/generated/luci-scheduler.cfg
+++ b/infra/config/global/generated/luci-scheduler.cfg
@@ -10,7 +10,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "linux-clang-dbg-x64"
   }
 }
@@ -20,7 +20,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "linux-clang-dbg-x86"
   }
 }
@@ -30,7 +30,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "linux-clang-rel-x64"
   }
 }
@@ -40,7 +40,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "linux-clang-rel-x86"
   }
 }
@@ -50,7 +50,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "mac-dbg"
   }
 }
@@ -60,7 +60,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "mac-rel"
   }
 }
@@ -70,7 +70,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-clang-dbg-x64"
   }
 }
@@ -80,7 +80,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-clang-dbg-x86"
   }
 }
@@ -90,7 +90,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-clang-rel-x64"
   }
 }
@@ -100,7 +100,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-clang-rel-x86"
   }
 }
@@ -110,7 +110,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-msvc-dbg-x64"
   }
 }
@@ -120,7 +120,7 @@ job {
   acl_sets: "ci"
   buildbucket {
     server: "cr-buildbucket.appspot.com"
-    bucket: "luci.tint.ci"
+    bucket: "ci"
     builder: "win-msvc-rel-x64"
   }
 }
diff --git a/infra/config/global/generated/project.cfg b/infra/config/global/generated/project.cfg
index 182dc1ef83..59dd096cc2 100644
--- a/infra/config/global/generated/project.cfg
+++ b/infra/config/global/generated/project.cfg
@@ -7,8 +7,9 @@
 name: "tint"
 access: "group:all"
 lucicfg {
-  version: "1.30.4"
+  version: "1.30.9"
   package_dir: ".."
   config_dir: "generated"
   entry_point: "main.star"
+  experiments: "crbug.com/1182002"
 }
diff --git a/infra/config/global/main.star b/infra/config/global/main.star
index b08d539efe..3a0b597dbb 100755
--- a/infra/config/global/main.star
+++ b/infra/config/global/main.star
@@ -8,6 +8,9 @@
 main.star: lucicfg configuration for Tint's standalone builers.
 """
 
+# Use LUCI Scheduler BBv2 names and add Scheduler realms configs.
+lucicfg.enable_experiment("crbug.com/1182002")
+
 luci.builder.defaults.experiments.set({
     "luci.recipes.use_python3": 100,
 })