Remove android debug testers from branch CI

These testers are triggered by "Android arm Builder (dbg)".
Unfortunately, these testers all have very limited capacity, e.g.
only 3 hosts for "KitKat Tablet Tester" (http://shortn/_FgzmFPwSjC).
In addition, it is not strictly necessary to run these testers
on the branches, as they are not run as part of Branch CQ; only
the compiler is mirrored onto CQ as "android_compile_dbg".

This CL removes these testers from the branched CI configuration.
In order to ensure that they continue to be appropriately triggered
on master, it adds a munger which ensures their scheduler tasks
have the appropriate names. In order to ensure that their absence
doesn't break the branch builders, it adds a generator which creates
no-op jobs with the appropriate names.

Bug: 1049150
Change-Id: Ie87bfc88580811e357feaaea0aeda9412e001f63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2076703Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745242}

infra/config/buckets/ci.star

@@ -132,6 +132,11 @@ ci.android_builder(
     name = 'Android ASAN (dbg)',
 )
 
+ci.android_builder(
+    name = 'Android WebView L (dbg)',
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
 ci.android_builder(
     name = 'Android WebView M (dbg)',
     triggered_by = ['Android arm64 Builder (dbg)'],
@@ -179,6 +184,43 @@ ci.android_builder(
     execution_timeout = 6 * time.hour,
 )
 
+ci.android_builder(
+    name = 'KitKat Phone Tester (dbg)',
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
+ci.android_builder(
+    name = 'KitKat Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 20 * time.hour,
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
+ci.android_builder(
+    name = 'Lollipop Phone Tester',
+    # We have limited phone capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 6 * time.hour,
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
+ci.android_builder(
+    name = 'Lollipop Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 20 * time.hour,
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
+ci.android_builder(
+    name = 'Marshmallow Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 12 * time.hour,
+    triggered_by = ['ci/Android arm Builder (dbg)'],
+)
+
 ci.android_builder(
     name = 'Marshmallow 64 bit Tester',
     triggered_by = ['Android arm64 Builder (dbg)'],

infra/config/consoles/main-beta.star

@@ -174,36 +174,6 @@ luci.console_view(
             category = 'chromium.android|builder|arm',
             short_name = '32',
         ),
-        luci.console_view_entry(
-            builder = 'ci-beta/KitKat Phone Tester (dbg)',
-            category = 'chromium.android|tester|phone',
-            short_name = 'K',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Lollipop Phone Tester',
-            category = 'chromium.android|tester|phone',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/KitKat Tablet Tester',
-            category = 'chromium.android|tester|tablet',
-            short_name = 'K',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Lollipop Tablet Tester',
-            category = 'chromium.android|tester|tablet',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Marshmallow Tablet Tester',
-            category = 'chromium.android|tester|tablet',
-            short_name = 'M',
-        ),
-        luci.console_view_entry(
-            builder = 'ci-beta/Android WebView L (dbg)',
-            category = 'chromium.android|tester|webview',
-            short_name = 'L',
-        ),
         luci.console_view_entry(
             builder = 'ci-beta/android-cronet-arm-rel',
             category = 'chromium.android|cronet|arm',

infra/config/generated/luci-milo.cfg

@@ -11344,36 +11344,6 @@ consoles: <
     category: "chromium.android|builder|arm"
     short_name: "32"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/KitKat Phone Tester (dbg)"
-    category: "chromium.android|tester|phone"
-    short_name: "K"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Lollipop Phone Tester"
-    category: "chromium.android|tester|phone"
-    short_name: "L"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/KitKat Tablet Tester"
-    category: "chromium.android|tester|tablet"
-    short_name: "K"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Lollipop Tablet Tester"
-    category: "chromium.android|tester|tablet"
-    short_name: "L"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Marshmallow Tablet Tester"
-    category: "chromium.android|tester|tablet"
-    short_name: "M"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci-beta/Android WebView L (dbg)"
-    category: "chromium.android|tester|webview"
-    short_name: "L"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/android-cronet-arm-rel"
     category: "chromium.android|cronet|arm"

infra/config/generated/luci-scheduler.cfg

@@ -252,6 +252,19 @@ job: <
     builder: "Android FYI dEQP Release (Nexus 5X)"
   >
 >
+job: <
+  id: "ci-Android WebView L (dbg)"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Android WebView L (dbg)"
+  >
+>
 job: <
   id: "Android WebView M (dbg)"
   acls: <
@@ -1209,6 +1222,32 @@ job: <
     builder: "GPU Win x64 Builder (dbg)"
   >
 >
+job: <
+  id: "ci-KitKat Phone Tester (dbg)"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "KitKat Phone Tester (dbg)"
+  >
+>
+job: <
+  id: "ci-KitKat Tablet Tester"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "KitKat Tablet Tester"
+  >
+>
 job: <
   id: "Leak Detection Linux"
   acl_sets: "ci"
@@ -1774,6 +1813,32 @@ job: <
     builder: "Linux remote_run Tester"
   >
 >
+job: <
+  id: "ci-Lollipop Phone Tester"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Phone Tester"
+  >
+>
+job: <
+  id: "ci-Lollipop Tablet Tester"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Lollipop Tablet Tester"
+  >
+>
 job: <
   id: "MSAN Release (chained origins)"
   acl_sets: "ci"
@@ -2168,6 +2233,19 @@ job: <
     builder: "Marshmallow 64 bit Tester"
   >
 >
+job: <
+  id: "ci-Marshmallow Tablet Tester"
+  acls: <
+    role: TRIGGERER
+    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+  >
+  acl_sets: "ci"
+  buildbucket: <
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Marshmallow Tablet Tester"
+  >
+>
 job: <
   id: "Mojo Android"
   acl_sets: "ci"
@@ -3799,19 +3877,6 @@ job: <
     builder: "Android Release (Nexus 5X)"
   >
 >
-job: <
-  id: "ci-Android WebView L (dbg)"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Android WebView L (dbg)"
-  >
->
 job: <
   id: "ci-Android arm Builder (dbg)"
   acl_sets: "ci"
@@ -3884,32 +3949,6 @@ job: <
     builder: "GPU Win x64 Builder"
   >
 >
-job: <
-  id: "ci-KitKat Phone Tester (dbg)"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "KitKat Phone Tester (dbg)"
-  >
->
-job: <
-  id: "ci-KitKat Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "KitKat Tablet Tester"
-  >
->
 job: <
   id: "ci-Linux ASan LSan Builder"
   acl_sets: "ci"
@@ -4006,32 +4045,6 @@ job: <
     builder: "Linux Tests"
   >
 >
-job: <
-  id: "ci-Lollipop Phone Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Lollipop Phone Tester"
-  >
->
-job: <
-  id: "ci-Lollipop Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Lollipop Tablet Tester"
-  >
->
 job: <
   id: "ci-Mac Builder"
   acl_sets: "ci"
@@ -4141,19 +4154,6 @@ job: <
     builder: "Mac10.13 Tests (dbg)"
   >
 >
-job: <
-  id: "ci-Marshmallow Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "Marshmallow Tablet Tester"
-  >
->
 job: <
   id: "ci-WebKit Mac10.13 (retina)"
   acls: <
@@ -4312,19 +4312,6 @@ job: <
     builder: "Android Release (Nexus 5X)"
   >
 >
-job: <
-  id: "ci-beta-Android WebView L (dbg)"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "Android WebView L (dbg)"
-  >
->
 job: <
   id: "ci-beta-Android arm Builder (dbg)"
   acl_sets: "ci-beta"
@@ -4397,32 +4384,6 @@ job: <
     builder: "GPU Win x64 Builder"
   >
 >
-job: <
-  id: "ci-beta-KitKat Phone Tester (dbg)"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "KitKat Phone Tester (dbg)"
-  >
->
-job: <
-  id: "ci-beta-KitKat Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "KitKat Tablet Tester"
-  >
->
 job: <
   id: "ci-beta-Linux ASan LSan Builder"
   acl_sets: "ci-beta"
@@ -4519,32 +4480,6 @@ job: <
     builder: "Linux Tests"
   >
 >
-job: <
-  id: "ci-beta-Lollipop Phone Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "Lollipop Phone Tester"
-  >
->
-job: <
-  id: "ci-beta-Lollipop Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "Lollipop Tablet Tester"
-  >
->
 job: <
   id: "ci-beta-Mac Builder"
   acl_sets: "ci-beta"
@@ -4654,19 +4589,6 @@ job: <
     builder: "Mac10.13 Tests (dbg)"
   >
 >
-job: <
-  id: "ci-beta-Marshmallow Tablet Tester"
-  acls: <
-    role: TRIGGERER
-    granted_to: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
-  >
-  acl_sets: "ci-beta"
-  buildbucket: <
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci-beta"
-    builder: "Marshmallow Tablet Tester"
-  >
->
 job: <
   id: "ci-beta-WebKit Mac10.13 (retina)"
   acls: <
@@ -6189,6 +6111,78 @@ job: <
   acl_sets: "ci"
   noop: <>
 >
+job: <
+  id: "ci-beta-Android WebView L (dbg)"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-Android WebView L (dbg)"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
+job: <
+  id: "ci-beta-KitKat Phone Tester (dbg)"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-KitKat Phone Tester (dbg)"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
+job: <
+  id: "ci-beta-KitKat Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-KitKat Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
+job: <
+  id: "ci-beta-Lollipop Phone Tester"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-Lollipop Phone Tester"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
+job: <
+  id: "ci-beta-Lollipop Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-Lollipop Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
+job: <
+  id: "ci-beta-Marshmallow Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-beta"
+  noop: <>
+>
+job: <
+  id: "ci-stable-Marshmallow Tablet Tester"
+  schedule: "triggered"
+  acl_sets: "ci-stable"
+  noop: <>
+>
 trigger: <
   id: "beta-gitiles-trigger"
   acl_sets: "ci-beta"

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

@@ -28,9 +28,37 @@ _GPU_NOOP_JOBS = [scheduler_pb.Job(
     'Win7 ANGLE Tryserver (AMD)',
 )]
 
+# Android testers which are triggered by Android arm Builder (dbg)
+# on master, but not on branches.
+_ANDROID_NON_BRANCHED_TESTERS = (
+    'Android WebView L (dbg)',
+    'KitKat Phone Tester (dbg)',
+    'KitKat Tablet Tester',
+    'Lollipop Phone Tester',
+    'Lollipop Tablet Tester',
+    'Marshmallow Tablet Tester',
+)
+_ANDROID_TEST_NOOP_JOBS = [scheduler_pb.Job(
+    id = bucket + '-' + builder,
+    schedule = 'triggered',
+    acl_sets = [bucket],
+    noop = scheduler_pb.NoopTask(),
+) for builder in _ANDROID_NON_BRANCHED_TESTERS for bucket in (
+    'ci-beta',
+    'ci-stable',
+)]
+
+
 def _add_noop_jobs(ctx):
   cfg = ctx.output['luci-scheduler.cfg']
-  for j in _GPU_NOOP_JOBS:
+  for j in _GPU_NOOP_JOBS + _ANDROID_TEST_NOOP_JOBS:
     cfg.job.append(j)
 
+def _munge_trunk_only_jobs(ctx):
+  cfg = ctx.output['luci-scheduler.cfg']
+  for j in cfg.job:
+    if j.id in _ANDROID_NON_BRANCHED_TESTERS:
+      j.id = 'ci-' + j.id
+
 lucicfg.generator(_add_noop_jobs)
+lucicfg.generator(_munge_trunk_only_jobs)

infra/config/versioned/milestones/m81/buckets/ci.star

@@ -40,11 +40,6 @@ ci.defaults.triggered_by.set([vars.poller.get()])
 # them, then lexicographically by their name
 
 
-ci.android_builder(
-    name = 'Android WebView L (dbg)',
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
 ci.android_builder(
     name = 'Android arm Builder (dbg)',
     execution_timeout = 4 * time.hour,
@@ -54,43 +49,6 @@ ci.android_builder(
     name = 'Cast Android (dbg)',
 )
 
-ci.android_builder(
-    name = 'KitKat Phone Tester (dbg)',
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'KitKat Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 20 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Lollipop Phone Tester',
-    # We have limited phone capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 6 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Lollipop Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 20 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Marshmallow Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 12 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
 ci.android_builder(
     name = 'android-cronet-arm-rel',
     notifies = ['cronet'],

infra/config/versioned/trunk/buckets/ci.star

@@ -40,11 +40,6 @@ ci.defaults.triggered_by.set([vars.poller.get()])
 # them, then lexicographically by their name
 
 
-ci.android_builder(
-    name = 'Android WebView L (dbg)',
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
 ci.android_builder(
     name = 'Android arm Builder (dbg)',
     execution_timeout = 4 * time.hour,
@@ -54,43 +49,6 @@ ci.android_builder(
     name = 'Cast Android (dbg)',
 )
 
-ci.android_builder(
-    name = 'KitKat Phone Tester (dbg)',
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'KitKat Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 20 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Lollipop Phone Tester',
-    # We have limited phone capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 6 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Lollipop Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 20 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
-ci.android_builder(
-    name = 'Marshmallow Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 12 * time.hour,
-    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
-)
-
 ci.android_builder(
     name = 'android-cronet-arm-rel',
     notifies = ['cronet'],