[code coverage] Merge linux-code-coverage-{builder, tester}.

...into linux-code-coverage, using the machine allocated to
linux-code-coverage-builder previously.

This is so that the code coverage report can be generated without
needing to transmit the instrumented binaries from the builder to the
tester, in addition to uploading it to isolate.

R=stgao,liaoyuke

Change-Id: I5af90704c78eee81f4bc2c28c9237334966045e1
Reviewed-on: https://chromium-review.googlesource.com/c/1306786Reviewed-by: Roberto Carrillo <robertocn@chromium.org>
Reviewed-by: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Roberto Carrillo <robertocn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604172}

infra/config/global/cr-buildbucket.cfg

@@ -1860,15 +1860,10 @@ buckets {
 
     # Code coverage reports generation bots.
     builders {
-      name: "linux-code-coverage-builder"
+      name: "linux-code-coverage"
       mixins: "code-coverage"
       dimensions: "cores:32"
     }
-    builders {
-      name: "linux-code-coverage-tester"
-      mixins: "code-coverage"
-      dimensions: "cores:8"
-    }
 
     builders {
       name: "mac-code-coverage-generation"

infra/config/global/luci-milo.cfg

@@ -2460,14 +2460,9 @@ consoles {
     category: "closure_compilation"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-code-coverage-builder"
-    category: "code_coverage|linux"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-code-coverage-tester"
-    category: "code_coverage|linux"
-    short_name: "tst"
+    name: "buildbucket/luci.chromium.ci/linux-code-coverage"
+    category: "code_coverage"
+    short_name: "lnx"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"
@@ -2816,14 +2811,9 @@ consoles {
     category: "closure_compilation"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/linux-code-coverage-builder"
-    category: "code_coverage|linux"
-    short_name: "bld"
-  }
-  builders {
-    name: "buildbucket/luci.chromium.ci/linux-code-coverage-tester"
-    category: "code_coverage|linux"
-    short_name: "tst"
+    name: "buildbucket/luci.chromium.ci/linux-code-coverage"
+    category: "code_coverage"
+    short_name: "lnx"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/mac-code-coverage-generation"

infra/config/global/luci-scheduler.cfg

@@ -310,7 +310,7 @@ trigger {
   triggers: "linux-chromeos-dbg"
   triggers: "linux-chromeos-rel"
   triggers: "linux-chromium-tests-staging-builder"
-  triggers: "linux-code-coverage-builder"
+  triggers: "linux-code-coverage"
   triggers: "linux-dbg"
   triggers: "linux-gcc-rel"
   triggers: "linux-jumbo-rel"
@@ -1561,23 +1561,12 @@ job {
 }
 
 job {
-  id: "linux-code-coverage-builder"
+  id: "linux-code-coverage"
   acl_sets: "default"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "linux-code-coverage-builder"
-  }
-}
-
-job {
-  id: "linux-code-coverage-tester"
-  # Triggered by "linux-code-coverage-buidler".
-  acl_sets: "triggered-by-parent-builders"
-  buildbucket: {
-    server: "cr-buildbucket.appspot.com"
-    bucket: "luci.chromium.ci"
-    builder: "linux-code-coverage-tester"
+    builder: "linux-code-coverage"
   }
 }
 

testing/buildbot/chromium.fyi.json

@@ -5852,7 +5852,7 @@
       }
     ]
   },
-  "linux-code-coverage-tester": {
+  "linux-code-coverage": {
     "gtest_tests": [
       {
         "isolate_coverage_data": true,

testing/buildbot/waterfalls.pyl

@@ -1375,7 +1375,7 @@
           'isolated_scripts': 'chromium_linux_rel_isolated_scripts',
         },
       },
-      'linux-code-coverage-tester': {
+      'linux-code-coverage': {
         'mixins': [
             'code-coverage',
         ],

tools/mb/mb_config.pyl

@@ -230,8 +230,7 @@
       'linux-blink-heap-incremental-marking': 'debug_bot_enable_blink_heap_incremental_marking',
       'linux-blink-heap-verification': 'release_bot_enable_blink_heap_verification_dcheck_always_on',
       'linux-chromium-tests-staging-builder': 'release_bot',
-      'linux-code-coverage-builder': 'clang_code_coverage',
-      'linux-code-coverage-tester': 'clang_code_coverage',
+      'linux-code-coverage': 'clang_code_coverage',
       'Mac deterministic': 'release_bot_mac_strip',
       'Mac deterministic (dbg)': 'debug_bot',