taler-deployment

commit 005180693348748195dba665d4060e26a39d4f90
parent 588bda4a71825a6610f0611fd398bddbe8bb1834
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Tue,  4 Dec 2018 15:50:15 +0100

Use list-comprehension to build roles' rules.

Diffstat:
M
buildbot/master.cfg
 | 
32
++++++++++++++++++--------------

1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -468,20 +468,24 @@ BUILDER_LIST = ["switcher-builder",
 
 authz = util.Authz(
     allowRules=[
-        # Unlock force-builds for admins.
-        util.ForceBuildEndpointMatcher(role="admins",
-                                       builder=BUILDER_LIST),
-        util.StopBuildEndpointMatcher(role="admins",
-                                      builder=BUILDER_LIST),
-        util.RebuildBuildEndpointMatcher(role="admins",
-                                         builder=BUILDER_LIST),
-        # Lock force-builds if above didn't match.
-        util.ForceBuildEndpointMatcher(role="norole",
-                                       builder=BUILDER_LIST),
-        util.StopBuildEndpointMatcher(role="norole",
-                                      builder=BUILDER_LIST),
-        util.RebuildBuildEndpointMatcher(role="norole",
-                                         builder=BUILDER_LIST)],
+        util.ForceBuildEndpointMatcher(
+            role="admins",
+            builder=b) for b in BUILDER_LIST]
+        + [util.StopBuildEndpointMatcher(
+            role="admins",
+            builder=b) for b in BUILDER_LIST]
+        + [util.RebuildBuildEndpointMatcher(
+            role="admins",
+            builder=b) for b in BUILDER_LIST]
+        + [util.ForceBuildEndpointMatcher(
+            role="norole",
+            builder=b) for b in BUILDER_LIST]
+        + [util.StopBuildEndpointMatcher(
+            role="norole",
+            builder=b) for b in BUILDER_LIST]
+        + [util.RebuildBuildEndpointMatcher(
+            role="norole",
+            builder=b) for b in BUILDER_LIST],
     roleMatchers=[
         util.RolesFromUsername(roles=["admins"],
                                usernames=["marcello",