[js-code-coverage] New builder for JavaScript code coverage

Setup a new builder for executing the Files app browser_tests to start collecting code coverage for their execution. This builder is based on the linux-chromeos-code-coverage CI builder. Accompanying internal CL is chrome-internal:3318844. Bug: 1113941 Cq-Depend: chromium:2345831 Change-Id: I39529060e6688d58baf04ff3644f227710f9df74 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2453336 Reviewed-by: Ben Pastene <bpastene@chromium.org> Commit-Queue: Ben Reich <benreich@chromium.org> Cr-Commit-Position: refs/heads/master@{#816023}
Denger-Network · Oct 11, 2020 · 0c24c16 · 0c24c16
1 parent 2ddb38e
commit 0c24c16
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 1 deletion.
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
@@ -11716,6 +11716,39 @@ buckets {
         }
       }
     }
+    builders {
+      name: "linux-chromeos-js-code-coverage"
+      swarming_host: "chromium-swarm.appspot.com"
+      swarming_tags: "vpython:native-python-wrapper"
+      dimensions: "builderless:1"
+      dimensions: "cores:32"
+      dimensions: "cpu:x86-64"
+      dimensions: "os:Ubuntu-16.04"
+      dimensions: "pool:luci.chromium.ci"
+      dimensions: "ssd:1"
+      exe {
+        cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+        cipd_version: "refs/heads/master"
+        cmd: "recipes"
+      }
+      properties: "{\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
+      execution_timeout_secs: 72000
+      build_numbers: YES
+      service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+      experiments {
+        key: "chromium.resultdb.result_sink"
+        value: 0
+      }
+      resultdb {
+        enable: true
+        bq_exports {
+          project: "luci-resultdb"
+          dataset: "chromium"
+          table: "ci_test_results"
+          test_results {}
+        }
+      }
+    }
     builders {
       name: "linux-chromeos-rel"
       swarming_host: "chromium-swarm.appspot.com"

diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
@@ -5029,6 +5029,11 @@ consoles {
     category: "code_coverage"
     short_name: "lcr"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/linux-chromeos-js-code-coverage"
+    category: "code_coverage"
+    short_name: "jcr"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/mac-code-coverage"
     category: "code_coverage"

diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
@@ -5237,6 +5237,17 @@ job {
     builder: "linux-chromeos-dbg"
   }
 }
+job {
+  id: "linux-chromeos-js-code-coverage"
+  realm: "ci"
+  schedule: "triggered"
+  acl_sets: "ci"
+  buildbucket {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "linux-chromeos-js-code-coverage"
+  }
+}
 job {
   id: "linux-chromeos-rel"
   realm: "ci"

diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
@@ -132,7 +132,7 @@ ci.console_view(
             "win32",
         ],
         "code_coverage": ci.ordering(
-            short_names = ["and", "ann", "lnx", "lcr", "mac"],
+            short_names = ["and", "ann", "lnx", "lcr", "jcr", "mac"],
         ),
         "mac": ci.ordering(short_names = ["bld", "15", "herm"]),
         "deterministic|mac": ci.ordering(short_names = ["rel", "dbg"]),
@@ -2710,6 +2710,16 @@ ci.fyi_coverage_builder(
     triggered_by = [],
 )
 
+ci.fyi_coverage_builder(
+    name = "linux-chromeos-js-code-coverage",
+    console_view_entry = ci.console_view_entry(
+        category = "code_coverage",
+        short_name = "jcr",
+    ),
+    schedule = "triggered",
+    triggered_by = [],
+)
+
 ci.fyi_coverage_builder(
     name = "linux-code-coverage",
     console_view_entry = ci.console_view_entry(

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -40707,6 +40707,33 @@
       }
     ]
   },
+  "linux-chromeos-js-code-coverage": {
+    "gtest_tests": [
+      {
+        "args": [
+          "--gtest_filter=*FilesApp*",
+          "--devtools-code-coverage"
+        ],
+        "isolate_profile_data": true,
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "js_code_coverage_browser_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test": "browser_tests",
+        "test_id_prefix": "ninja://chrome/test:browser_tests/"
+      }
+    ]
+  },
   "linux-chromium-tests-staging-builder": {
     "additional_compile_targets": [
       "all"

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -3289,6 +3289,17 @@
     },
 
     # END tests which run on the GPU bots
+
+    'js_code_coverage_browser_tests' : {
+      'js_code_coverage_browser_tests': {
+        'args': [
+          '--gtest_filter=*FilesApp*',
+          '--devtools-code-coverage'
+        ],
+        'test': 'browser_tests',
+      }
+    },
+
     'layout_ng_gtests': {
       'webkit_unit_tests_ng': {
         'args': [

diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
@@ -2463,6 +2463,15 @@
           'gtest_tests': 'linux_chromeos_gtests',
         },
       },
+      'linux-chromeos-js-code-coverage': {
+        'mixins': [
+          'isolate_profile_data',
+          'linux-xenial',
+        ],
+        'test_suites': {
+          'gtest_tests': 'js_code_coverage_browser_tests'
+        },
+      },
       'linux-chromium-tests-staging-builder': {
         'additional_compile_targets': [
           'all',

diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
@@ -301,6 +301,7 @@
       'linux-builderless-fast-fyi-rel': 'gpu_tests_release_bot',
       'linux-builderless-slow-fyi-rel': 'gpu_tests_release_bot',
       'linux-chromeos-code-coverage': 'chromeos_with_codecs_release_bot_coverage',
+      'linux-chromeos-js-code-coverage': 'chromeos_with_codecs_release_bot',
       'linux-chromium-tests-staging-builder': 'release_bot',
       'linux-code-coverage': 'clang_code_coverage',
       'linux-fieldtrial-rel': 'release_bot_minimal_symbols',

diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -514,6 +514,16 @@
       "use_goma": true
     }
   },
+  "linux-chromeos-js-code-coverage": {
+    "gn_args": {
+      "ffmpeg_branding": "ChromeOS",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux-chromium-tests-staging-builder": {
     "gn_args": {
       "is_component_build": false,