Remove luci, compile, and test configurations for six decommed android bots.

Bug: 790137, 790148
Change-Id: I887131fdd09852a8b400f797096971ce1fde1a76
Reviewed-on: https://chromium-review.googlesource.com/c/1457817
Auto-Submit: John Budorick <jbudorick@chromium.org>
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630023}

infra/config/global/cr-buildbucket.cfg

@@ -1937,11 +1937,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "x86 Cloud Tester"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "TSAN Release"
       dimensions: "os:Ubuntu-14.04"
@@ -1961,11 +1956,6 @@ buckets {
       dimensions: "os:Windows-10"
       mixins: "fyi-ci"
     }
-    builders {
-      name: "NDK Next arm64 Builder"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "WebKit Linux Trusty MSAN"
       dimensions: "os:Ubuntu-14.04"
@@ -2383,11 +2373,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "memory-ci"
     }
-    builders {
-      name: "NDK Next arm Builder"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "ASan Release Media (32-bit x86 with V8-ARM)"
       dimensions: "os:Ubuntu-14.04"
@@ -2405,11 +2390,6 @@ buckets {
       # OS shouldn't matter.
       dimensions: "os:Ubuntu-14.04"
     }
-    builders {
-      name: "NDK Next x64 Builder"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "Android Find Annotated Test"
       dimensions: "os:Ubuntu-14.04"
@@ -2457,11 +2437,6 @@ buckets {
       dimensions: "os:Mac-10.13"
       mixins: "chromium-ci"
     }
-    builders {
-      name: "NDK Next x86 Builder"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "Linux ChromiumOS MSan Builder"
       dimensions: "os:Ubuntu-14.04"
@@ -2482,11 +2457,6 @@ buckets {
       dimensions: "os:Ubuntu-14.04"
       mixins: "android-fyi-ci"
     }
-    builders {
-      name: "x64 Device Tester"
-      dimensions: "os:Ubuntu-14.04"
-      mixins: "android-fyi-ci"
-    }
     builders {
       name: "Chromium Windows Analyze"
       dimensions: "os:Windows-10"

infra/config/global/luci-milo.cfg

@@ -1798,42 +1798,6 @@ consoles {
     category: "Testers"
     short_name: "N"
   }
-  builders {
-    name: "buildbot/chromium.android.fyi/x64 Device Tester"
-    name: "buildbucket/luci.chromium.ci/x64 Device Tester"
-    category: "Testers"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbot/chromium.android.fyi/x86 Cloud Tester"
-    name: "buildbucket/luci.chromium.ci/x86 Cloud Tester"
-    category: "Testers"
-    short_name: "cld"
-  }
-  builders {
-    name: "buildbot/chromium.android.fyi/NDK Next arm Builder"
-    name: "buildbucket/luci.chromium.ci/NDK Next arm Builder"
-    category: "NDK Builders"
-    short_name: "a32"
-  }
-  builders {
-    name: "buildbot/chromium.android.fyi/NDK Next arm64 Builder"
-    name: "buildbucket/luci.chromium.ci/NDK Next arm64 Builder"
-    category: "NDK Builders"
-    short_name: "a64"
-  }
-  builders {
-    name: "buildbot/chromium.android.fyi/NDK Next x64 Builder"
-    name: "buildbucket/luci.chromium.ci/NDK Next x64 Builder"
-    category: "NDK Builders"
-    short_name: "x64"
-  }
-  builders {
-    name: "buildbot/chromium.android.fyi/NDK Next x86 Builder"
-    name: "buildbucket/luci.chromium.ci/NDK Next x86 Builder"
-    category: "NDK Builders"
-    short_name: "x86"
-  }
   builders {
     name: "buildbot/chromium.android.fyi/Memory Infra Tester"
     name: "buildbucket/luci.chromium.ci/Memory Infra Tester"

infra/config/global/luci-scheduler.cfg

@@ -3895,46 +3895,6 @@ job {
   }
 }
 
-job {
-  id: "NDK Next arm Builder"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "NDK Next arm Builder"
-  }
-}
-
-job {
-  id: "NDK Next arm64 Builder"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "NDK Next arm64 Builder"
-  }
-}
-
-job {
-  id: "NDK Next x64 Builder"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "NDK Next x64 Builder"
-  }
-}
-
-job {
-  id: "NDK Next x86 Builder"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "NDK Next x86 Builder"
-  }
-}
-
 job {
   id: "Site Isolation Android"
   acl_sets: "default"
@@ -4395,26 +4355,6 @@ job {
   }
 }
 
-job {
-  id: "x64 Device Tester"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "x64 Device Tester"
-  }
-}
-
-job {
-  id: "x86 Cloud Tester"
-  acl_sets: "default"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "x86 Cloud Tester"
-  }
-}
-
 job {
   id: "x86 Emulator Tester"
   acl_sets: "default"

testing/buildbot/test_suite_exceptions.pyl

@@ -22,8 +22,6 @@
       'android-kitkat-arm-rel',
       'KitKat Phone Tester (dbg)',
       'KitKat Tablet Tester',
-      # chromium.android.fyi
-      'x64 Device Tester',
     ],
   },
   'angle_end2end_tests': {
@@ -306,9 +304,6 @@
       'KitKat Tablet Tester',
       'Lollipop Tablet Tester',
       'Marshmallow Tablet Tester',
-      # chromium.android.fyi
-      'x64 Device Tester',
-      'x86 Cloud Tester',
       # chromium.clang
       'ToTAndroid',
       'ToTAndroidCFI',
@@ -787,8 +782,6 @@
       'Lollipop Tablet Tester',
       'Marshmallow Tablet Tester',
       'KitKat Phone Tester (dbg)',
-      # chromium.android.fyi
-      'x86 Cloud Tester',
       # chromium.memory
       'Android CFI',
       # chromium.clang
@@ -857,8 +850,6 @@
       'Lollipop Tablet Tester',
       'Marshmallow Tablet Tester',
       'KitKat Phone Tester (dbg)',
-      # chromium.android.fyi
-      'x86 Cloud Tester',
       # chromium.memory
       'Android CFI',
       # chromium.clang
@@ -1103,16 +1094,6 @@
           'shards': 15,
         },
       },
-      # chromium.android.fyi
-      'x86 Cloud Tester': {
-        'args': [
-          '--browser=android-chromium',
-          '--device=android',
-        ],
-        'swarming': {
-          'shards': 1,
-        },
-      },
       # chromium.fyi
       'linux-chromium-tests-staging-tests': {
         'args': [
@@ -1292,13 +1273,6 @@
       'Win10 Tests x64',
     ],
   },
-  'vr_android_unittests': {
-    'remove_from': [
-      # chromium.android.fyi
-      'x64 Device Tester',
-      'x86 Cloud Tester',
-    ],
-  },
   'vr_pixeltests': {
     'remove_from': [
       # chromium.fyi

testing/buildbot/waterfalls.pyl

@@ -622,39 +622,6 @@
           'gtest_tests': 'chromium_android_gtests',
         },
       },
-      'x64 Device Tester': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'device_type': 'coho',
-              'os': 'Android',
-            },
-          ],
-        },
-        'os_type': 'android',
-        'skip_cipd_packages': True,
-        'skip_output_links': True,
-        'test_suites': {
-          'gtest_tests': 'chromium_android_gtests',
-        },
-      },
-      'x86 Cloud Tester': {
-        'swarming': {
-          'dimension_sets': [
-            {
-              'device_type': 'gce_x86',
-              'os': 'Android',
-            },
-          ],
-        },
-        'os_type': 'android',
-        'skip_cipd_packages': True,
-        'skip_output_links': True,
-        'test_suites': {
-          'gtest_tests': 'chromium_android_gtests',
-          'isolated_scripts': 'telemetry_perf_unittests_isolated_scripts',
-        },
-      },
     },
   },
   {