Don't generated branched jobs for dummy GPU builders.

The dummy GPU builders are triggered by non-branched builders that
won't have the bucketed_triggers property set.

Bug: 1061502
No-Try: true
Change-Id: I0054470418bd0736f4e256c5ae49680799362e71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2103249
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750237}

infra/config/generated/luci-scheduler.cfg

@@ -6431,7 +6431,7 @@ job: <
   >
 >
 job: <
-  id: "ci-ANGLE GPU Linux Release (Intel HD 630)"
+  id: "ANGLE GPU Linux Release (Intel HD 630)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6441,27 +6441,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Linux Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Linux Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Linux Release (NVIDIA)"
+  id: "ANGLE GPU Linux Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6471,27 +6451,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Linux Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Linux Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Mac Release (Intel)"
+  id: "ANGLE GPU Mac Release (Intel)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6501,27 +6461,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Mac Release (Intel)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Mac Release (Intel)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Mac Retina Release (AMD)"
+  id: "ANGLE GPU Mac Retina Release (AMD)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6531,27 +6471,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Mac Retina Release (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Mac Retina Release (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Mac Retina Release (NVIDIA)"
+  id: "ANGLE GPU Mac Retina Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6561,27 +6481,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Mac Retina Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Mac Retina Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Win10 x64 Release (Intel HD 630)"
+  id: "ANGLE GPU Win10 x64 Release (Intel HD 630)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6591,27 +6491,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Win10 x64 Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Win10 x64 Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-ANGLE GPU Win10 x64 Release (NVIDIA)"
+  id: "ANGLE GPU Win10 x64 Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6621,27 +6501,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-ANGLE GPU Win10 x64 Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-ANGLE GPU Win10 x64 Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Linux Release (Intel HD 630)"
+  id: "Optional Linux Release (Intel HD 630)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6651,27 +6511,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Linux Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Linux Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Linux Release (NVIDIA)"
+  id: "Optional Linux Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6681,27 +6521,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Linux Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Linux Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Mac Release (Intel)"
+  id: "Optional Mac Release (Intel)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6711,27 +6531,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Mac Release (Intel)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Mac Release (Intel)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Mac Retina Release (AMD)"
+  id: "Optional Mac Retina Release (AMD)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6741,27 +6541,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Mac Retina Release (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Mac Retina Release (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Mac Retina Release (NVIDIA)"
+  id: "Optional Mac Retina Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6771,27 +6551,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Mac Retina Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Mac Retina Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Win10 x64 Release (Intel HD 630)"
+  id: "Optional Win10 x64 Release (Intel HD 630)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6801,27 +6561,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Win10 x64 Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Win10 x64 Release (Intel HD 630)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Optional Win10 x64 Release (NVIDIA)"
+  id: "Optional Win10 x64 Release (NVIDIA)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6831,27 +6571,7 @@ job: <
   noop: <>
 >
 job: <
-  id: "ci-beta-Optional Win10 x64 Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Optional Win10 x64 Release (NVIDIA)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
-job: <
-  id: "ci-Win7 ANGLE Tryserver (AMD)"
+  id: "Win7 ANGLE Tryserver (AMD)"
   schedule: "triggered"
   acls: <
     role: TRIGGERER
@@ -6860,26 +6580,6 @@ job: <
   acl_sets: "ci"
   noop: <>
 >
-job: <
-  id: "ci-beta-Win7 ANGLE Tryserver (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  noop: <>
->
-job: <
-  id: "ci-stable-Win7 ANGLE Tryserver (AMD)"
-  schedule: "triggered"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-stable"
-  noop: <>
->
 job: <
   id: "ci-beta-Android WebView L (dbg)"
   schedule: "triggered"

infra/config/generators/scheduler-noop-jobs.star

@@ -2,9 +2,9 @@
 load('@stdlib//internal/luci/proto.star', 'scheduler_pb')
 
 _GPU_NOOP_JOBS = [scheduler_pb.Job(
-    id = '{}-{}'.format(bucket, builder),
+    id = builder,
     schedule = 'triggered',
-    acl_sets = [bucket],
+    acl_sets = ['ci'],
     acls = [scheduler_pb.Acl(
         role = scheduler_pb.Acl.TRIGGERER,
         granted_to = 'chromium-ci-gpu-builder@chops-service-accounts.iam.gserviceaccount.com',
@@ -26,10 +26,6 @@ _GPU_NOOP_JOBS = [scheduler_pb.Job(
     'Optional Win10 x64 Release (Intel HD 630)',
     'Optional Win10 x64 Release (NVIDIA)',
     'Win7 ANGLE Tryserver (AMD)',
-) for bucket in (
-    'ci',
-    'ci-beta',
-    'ci-stable',
 )]
 
 # Android testers which are triggered by Android arm Builder (dbg)