Revert "Move generated LUCI files" This reverts commit abde297cd9e8f52fb0e27dc94327ebfad26da96a. Reason for revert: Speculative revert for CQ not working. Bug: 385317083 Original change's description: > Move generated LUCI files > > Moves the generated LUCI config files from > //infra/config/global/generated to //infra/config/global/generated/luci. > This should be a functional no-op. > > This is in line with what Chromium does and is a prerequisite for some > upcoming Starlark changes for several reasons: > > 1. We'll be generating significantly more files in the near future, so > it is helpful to group them appropriately. > 2. The Starlark code we are taking a dependency on currently assumes > that the generated LUCI files are in a luci/ subdirectory. While this > should be fixed in the longer term, moving these files will unblock > us sooner. > > Bug: 385317083 > Change-Id: Ib60f354d94833dc13abc8e653d213d76073eec7d > Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/255618 > Auto-Submit: Brian Sheedy <bsheedy@google.com> > Reviewed-by: Kai Ninomiya <kainino@chromium.org> > Commit-Queue: Kai Ninomiya <kainino@chromium.org> TBR=kainino@chromium.org,bsheedy@google.com,dawn-scoped@luci-project-accounts.iam.gserviceaccount.com No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 385317083 Change-Id: Ie8314fda75d317873f79d7dafe708580afab4c99 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/255562 Commit-Queue: Brian Sheedy <bsheedy@google.com> Reviewed-by: Brian Sheedy <bsheedy@google.com> Reviewed-by: James Price <jrprice@google.com>
diff --git a/infra/config/global/generated/luci/commit-queue.cfg b/infra/config/global/generated/commit-queue.cfg similarity index 100% rename from infra/config/global/generated/luci/commit-queue.cfg rename to infra/config/global/generated/commit-queue.cfg
diff --git a/infra/config/global/generated/luci/cr-buildbucket.cfg b/infra/config/global/generated/cr-buildbucket.cfg similarity index 100% rename from infra/config/global/generated/luci/cr-buildbucket.cfg rename to infra/config/global/generated/cr-buildbucket.cfg
diff --git a/infra/config/global/generated/luci/luci-logdog.cfg b/infra/config/global/generated/luci-logdog.cfg similarity index 100% rename from infra/config/global/generated/luci/luci-logdog.cfg rename to infra/config/global/generated/luci-logdog.cfg
diff --git a/infra/config/global/generated/luci/luci-milo.cfg b/infra/config/global/generated/luci-milo.cfg similarity index 100% rename from infra/config/global/generated/luci/luci-milo.cfg rename to infra/config/global/generated/luci-milo.cfg
diff --git a/infra/config/global/generated/luci/luci-notify.cfg b/infra/config/global/generated/luci-notify.cfg similarity index 100% rename from infra/config/global/generated/luci/luci-notify.cfg rename to infra/config/global/generated/luci-notify.cfg
diff --git a/infra/config/global/generated/luci/luci-scheduler.cfg b/infra/config/global/generated/luci-scheduler.cfg similarity index 100% rename from infra/config/global/generated/luci/luci-scheduler.cfg rename to infra/config/global/generated/luci-scheduler.cfg
diff --git a/infra/config/global/generated/luci/project.cfg b/infra/config/global/generated/project.cfg similarity index 81% rename from infra/config/global/generated/luci/project.cfg rename to infra/config/global/generated/project.cfg index 63b1ffe..e375b0a 100644 --- a/infra/config/global/generated/luci/project.cfg +++ b/infra/config/global/generated/project.cfg
@@ -9,11 +9,10 @@ lucicfg { version: "1.45.6" package_name: "@dawn-project" - package_dir: "../.." - config_dir: "generated/luci" + package_dir: ".." + config_dir: "generated" entry_point: "main.star" experiments: "crbug.com/1182002" experiments: "crbug.com/1347252" experiments: "crbug.com/1496969" - experiments: "crbug.com/421431364" }
diff --git a/infra/config/global/generated/luci/realms.cfg b/infra/config/global/generated/realms.cfg similarity index 100% rename from infra/config/global/generated/luci/realms.cfg rename to infra/config/global/generated/realms.cfg
diff --git a/infra/config/global/main.star b/infra/config/global/main.star index 0844740..c46181a 100755 --- a/infra/config/global/main.star +++ b/infra/config/global/main.star
@@ -41,7 +41,6 @@ luci.project( name = "dawn", - config_dir = "luci", buildbucket = "cr-buildbucket.appspot.com", logdog = "luci-logdog.appspot.com", milo = "luci-milo.appspot.com",