Rename gitiles triggers to make new luci-config version.
This will affect the files within the 'generated' subdirectory, which
will force a new version to be pulled by luci-config (I forgot that the
previous CL wouldn't be enough :().
The actual change here just removes redundancy from the trigger names
(they were previously set as if they needed namespacing or additional
qualification).
R=ngeoffray@google.com, tandrii@google.com
Change-Id: Ic767f8d7054609683dfcf1919228a6c452b193e9
diff --git a/tools/luci/config/generated/luci-scheduler.cfg b/tools/luci/config/generated/luci-scheduler.cfg
index 0e2818d..9d6c591 100644
--- a/tools/luci/config/generated/luci-scheduler.cfg
+++ b/tools/luci/config/generated/luci-scheduler.cfg
@@ -230,40 +230,7 @@
}
}
trigger {
- id: "master-art-manifest-gitiles-trigger"
- acl_sets: "ci"
- triggers: "angler-armv7-debug"
- triggers: "angler-armv7-ndebug"
- triggers: "angler-armv7-non-gen-cc"
- triggers: "angler-armv8-debug"
- triggers: "angler-armv8-ndebug"
- triggers: "angler-armv8-non-gen-cc"
- triggers: "bullhead-armv7-gcstress-ndebug"
- triggers: "bullhead-armv8-gcstress-debug"
- triggers: "bullhead-armv8-gcstress-ndebug"
- triggers: "fugu-debug"
- triggers: "fugu-ndebug"
- triggers: "host-x86-cms"
- triggers: "host-x86-debug"
- triggers: "host-x86-gcstress-debug"
- triggers: "host-x86-ndebug"
- triggers: "host-x86-poison-debug"
- triggers: "host-x86_64-cdex-fast"
- triggers: "host-x86_64-cms"
- triggers: "host-x86_64-debug"
- triggers: "host-x86_64-ndebug"
- triggers: "host-x86_64-non-gen-cc"
- triggers: "host-x86_64-poison-debug"
- triggers: "walleye-armv7-poison-debug"
- triggers: "walleye-armv8-poison-debug"
- triggers: "walleye-armv8-poison-ndebug"
- gitiles {
- repo: "https://android.googlesource.com/platform/manifest"
- refs: "regexp:refs/heads/master-art"
- }
-}
-trigger {
- id: "master-gitiles-trigger"
+ id: "art"
acl_sets: "ci"
triggers: "angler-armv7-debug"
triggers: "angler-armv7-ndebug"
@@ -296,7 +263,7 @@
}
}
trigger {
- id: "master-libcore-gitiles-trigger"
+ id: "libcore"
acl_sets: "ci"
triggers: "angler-armv7-debug"
triggers: "angler-armv7-ndebug"
@@ -328,6 +295,39 @@
refs: "regexp:refs/heads/master"
}
}
+trigger {
+ id: "manifest"
+ acl_sets: "ci"
+ triggers: "angler-armv7-debug"
+ triggers: "angler-armv7-ndebug"
+ triggers: "angler-armv7-non-gen-cc"
+ triggers: "angler-armv8-debug"
+ triggers: "angler-armv8-ndebug"
+ triggers: "angler-armv8-non-gen-cc"
+ triggers: "bullhead-armv7-gcstress-ndebug"
+ triggers: "bullhead-armv8-gcstress-debug"
+ triggers: "bullhead-armv8-gcstress-ndebug"
+ triggers: "fugu-debug"
+ triggers: "fugu-ndebug"
+ triggers: "host-x86-cms"
+ triggers: "host-x86-debug"
+ triggers: "host-x86-gcstress-debug"
+ triggers: "host-x86-ndebug"
+ triggers: "host-x86-poison-debug"
+ triggers: "host-x86_64-cdex-fast"
+ triggers: "host-x86_64-cms"
+ triggers: "host-x86_64-debug"
+ triggers: "host-x86_64-ndebug"
+ triggers: "host-x86_64-non-gen-cc"
+ triggers: "host-x86_64-poison-debug"
+ triggers: "walleye-armv7-poison-debug"
+ triggers: "walleye-armv8-poison-debug"
+ triggers: "walleye-armv8-poison-ndebug"
+ gitiles {
+ repo: "https://android.googlesource.com/platform/manifest"
+ refs: "regexp:refs/heads/master-art"
+ }
+}
acl_sets {
name: "ci"
acls {
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index b847be8..8abb868 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -101,21 +101,21 @@
)
luci.gitiles_poller(
- name = "master-gitiles-trigger",
+ name = "art",
bucket = "ci",
repo = "https://android.googlesource.com/platform/art",
refs = ["refs/heads/master"],
)
luci.gitiles_poller(
- name = "master-libcore-gitiles-trigger",
+ name = "libcore",
bucket = "ci",
repo = "https://android.googlesource.com/platform/libcore",
refs = ["refs/heads/master"],
)
luci.gitiles_poller(
- name = "master-art-manifest-gitiles-trigger",
+ name = "manifest",
bucket = "ci",
repo = "https://android.googlesource.com/platform/manifest",
refs = ["refs/heads/master-art"],
@@ -153,9 +153,9 @@
],
notifies = ["art-team+chromium-buildbot"],
triggered_by = [
- "master-gitiles-trigger",
- "master-libcore-gitiles-trigger",
- "master-art-manifest-gitiles-trigger",
+ "art",
+ "libcore",
+ "manifest",
],
)
luci.console_view_entry(