WIP

Author: devversion

.circleci/config.yml

@@ -312,17 +312,35 @@ jobs:
     resource_class: xlarge
     environment:
       SAUCE_USERNAME: "angular-components"
-      SAUCE_ACCESS_KEY: "63348201a846-eeb9-3ee4-300f-ea990b8a"
-      # Note: This number should not be too high because otherwise we might run into
-      # a rate limit exception.
-      KARMA_PARALLEL_BROWSERS: 2
+      SAUCE_ACCESS_KEY: "a8b099ae-f003-4ee3-9bee-648a10284336"
+      SAUCE_TUNNEL_IDENTIFIER: angular-material-<< pipeline.id >>
     steps:
     - checkout_and_rebase
     - *restore_cache
     - *setup_bazel_ci_config
     - *yarn_install
 
-    - run: ./scripts/circleci/run-saucelabs-tests.sh
+    - run:
+        name: Saucelabs tunnel
+        command: ./scripts/saucelabs/start-tunnel.sh
+        background: true
+    - run:
+        name: Waiting for Saucelabs tunnel
+        command: ./scripts/saucelabs/wait-tunnel.sh
+    - run:
+        name: Saucelabs browser daemon
+        command: yarn -s sauce-bazel-daemon
+        background: true
+
+    - run:
+        name: Running tests
+        command: |
+          TESTS=$(yarn -s bazel query --output label 'attr("tags", "saucelabs", //src/...)')
+          yarn -s bazel test ${TESTS} --jobs=2
+
+    - run:
+        name: Shutting down tunnel
+        command: ./scripts/saucelabs/stop-tunnel.sh
     - *slack_notify_on_failure
 
   # ----------------------------------
@@ -663,46 +681,8 @@ workflows:
 
   default_workflow:
     jobs:
-      - bazel_build:
-          filters: *ignore_presubmit_branch_filter
-      - view_engine_build:
-          filters: *ignore_presubmit_branch_filter
-      - view_engine_test:
-          filters: *ignore_presubmit_branch_filter
-      - api_golden_checks:
-          filters: *ignore_presubmit_branch_filter
-      - integration_tests:
-          filters: *ignore_presubmit_branch_filter
-      - tests_local_browsers:
-          filters: *ignore_presubmit_branch_filter
-      - tests_browserstack:
-          filters: *ignore_presubmit_branch_filter
       - tests_saucelabs:
           filters: *ignore_presubmit_branch_filter
-      - e2e_tests:
-          filters: *ignore_presubmit_branch_filter
-      - build_release_packages:
-          filters: *ignore_presubmit_branch_filter
-      - upload_release_packages:
-          # We don't want to run this job on push builds because for those, the
-          # `publish_snapshots` runs, and publishes build artifacts.
-          filters: *only_on_pull_requests_filter
-          requires:
-            - build_release_packages
-      - lint:
-          filters: *ignore_presubmit_branch_filter
-      - ngcc_compatibility:
-          filters: *ignore_presubmit_branch_filter
-          requires:
-            - build_release_packages
-      - ngcc_compatibility_snapshot:
-          filters: *only_main_branch_filter
-          requires:
-            - build_release_packages
-      - publish_snapshots:
-          filters: *publish_branches_filter
-          requires:
-            - build_release_packages
 
   # Snapshot tests workflow that is scheduled to run all specified jobs every hour.
   # This workflow runs various jobs against the Angular snapshot builds from Github.

BUILD.bazel

@@ -26,11 +26,3 @@ genrule(
     outs = ["entry_points_manifest.json"],
     cmd = "echo '%s' > $@" % entryPoints,
 )
-
-genrule(
-    name = "saucelabs_tunnel_identifier",
-    outs = ["saucelabs_tunnel_identifier.txt"],
-    cmd = "$(execpath //scripts/saucelabs:extract-tunnel-identifier) > $@",
-    stamp = True,
-    tools = ["//scripts/saucelabs:extract-tunnel-identifier"],
-)

package.json

@@ -48,7 +48,8 @@
     "integration-tests:size-test": "bazel test //integration/size-test/...",
     "check-mdc-tests": "ts-node --project scripts/tsconfig.json scripts/check-mdc-tests.ts",
     "check-mdc-exports": "ts-node --project scripts/tsconfig.json scripts/check-mdc-exports.ts",
-    "check-tools": "yarn tsc --project tools/tsconfig-ci.json"
+    "check-tools": "yarn tsc --project tools/tsconfig-ci.json",
+    "sauce-bazel-daemon": "ts-node --project tools/saucelabs-bazel/tsconfig.json tools/saucelabs-bazel/background-service/cli.ts"
   },
   "version": "12.1.0-next.0",
   "dependencies": {

scripts/circleci/run-saucelabs-tests.sh

@@ -87,4 +87,4 @@ sass_library(
         "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib",
         "//src/material/core:core_scss_lib",
     ],
-)
+)

scripts/saucelabs/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:create-system-config.bzl", "create_system_config")
-load("//tools:defaults.bzl", "ts_library")
+load("//tools:defaults.bzl", "js_library", "ts_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -33,3 +33,21 @@ create_system_config(
     output_name = "system-config.js",
     packages_dir = "dist/packages",
 )
+
+js_library(
+    name = "karma-browser-config",
+    srcs = [
+        "browser-providers.js",
+        "karma-browsers.json",
+    ],
+)
+
+js_library(
+    name = "karma-saucelabs-config",
+    srcs = ["karma-saucelabs.conf.js"],
+    deps = [
+        ":karma-browser-config",
+        "//tools/saucelabs-bazel/launcher",
+        "@npm//@bazel/runfiles",
+    ],
+)

scripts/saucelabs/extract-tunnel-identifier.sh

@@ -1,19 +1,12 @@
 {
-  "ChromeHeadlessCI": {
-    "base": "ChromeHeadless",
-    "flags": [
-      "--window-size=1024,768",
-      "--no-sandbox"
-    ]
-  },
   "ChromeLocalDebug": {
     "base": "Chrome",
     "flags": [
       "--window-size=1024,768"
     ]
   },
   "SAUCELABS_IOS13": {
-    "base": "SauceLabs",
+    "base": "SauceLabsDaemon",
     "browserName": "Safari",
     "platformVersion": "13.2",
     "platformName": "iOS",

src/material-experimental/mdc-form-field/BUILD.bazel

@@ -1,39 +1,25 @@
-const {readFileSync} = require('fs');
+const {runfiles} = require('@bazel/runfiles');
 const {customLaunchers, platformMap} = require('./browser-providers');
 
+// Since we load a Karma plugin directly from the sources, we load the NodeJS require
+// patch. This is needed as the TypeScript output uses absolute manifest paths between files.
+// TODO: Consider removing if we switch the repository to `ts_project`, or if the linker
+// symlinks the workspace root by default.
+runfiles.patchRequire();
+
 module.exports = karmaConfig => {
   const config = {
     plugins: [
-      require('karma-sauce-launcher')
+      require(runfiles.resolveWorkspaceRelative('tools/saucelabs-bazel/launcher/index.js')),
     ],
     customLaunchers: customLaunchers,
-    sauceLabs: {
-      testName: 'Angular Material Unit Tests',
-      startConnect: false,
-      recordVideo: false,
-      recordScreenshots: false,
-      idleTimeout: 600,
-      commandTimeout: 600,
-      maxDuration: 5400,
-    },
-    browserNoActivityTimeout: 300000,
-    browserDisconnectTimeout: 180000,
-    browserDisconnectTolerance: 3,
-    captureTimeout: 180000,
+    browserNoActivityTimeout: 90000,
+    browserDisconnectTimeout: 90000,
+    browserDisconnectTolerance: 2,
+    captureTimeout: 90000,
     browsers: platformMap.saucelabs,
-
-    // Try Websocket for a faster transmission first. Fallback to polling if necessary.
-    transports: ['websocket', 'polling'],
+    transports: ['polling', 'websocket'],
   };
 
-  // The tunnel identifier has been written to a stamped genrule that access the tunnel
-  // identifier through a volatile status key. This ensures that test and build results
-  // are not invalidated whenever the tunnel identifier changes (which it does for each PR).
-  const tunnelIdentifier = readFileSync(
-      require.resolve('../saucelabs_tunnel_identifier.txt'), 'utf8');
-
-  config.sauceLabs.build = tunnelIdentifier;
-  config.sauceLabs.tunnelIdentifier = tunnelIdentifier;
-
   karmaConfig.set(config);
 };

test/BUILD.bazel

@@ -1,5 +1,6 @@
 # Re-export of Bazel rules with repository-wide defaults
 
+load("@build_bazel_rules_nodejs//:index.bzl", _js_library = "js_library")
 load("@io_bazel_rules_sass//:defs.bzl", _sass_binary = "sass_binary", _sass_library = "sass_library")
 load("@npm//@angular/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("@npm//@bazel/jasmine:index.bzl", _jasmine_node_test = "jasmine_node_test")
@@ -31,6 +32,9 @@ def sass_binary(sourcemap = False, **kwargs):
 def sass_library(**kwargs):
     _sass_library(**kwargs)
 
+def js_library(**kwargs):
+    _js_library(**kwargs)
+
 def ts_library(tsconfig = None, deps = [], testonly = False, **kwargs):
     # Add tslib because we use import helpers for all public packages.
     local_deps = ["@npm//tslib"] + deps
@@ -156,22 +160,25 @@ def ng_e2e_test_library(deps = [], tsconfig = None, **kwargs):
     )
 
 def karma_web_test(name, **kwargs):
-  tags = kwargs.pop("tags", [])
-  # Custom standalone web test that can be run to test against any browser
-  # that is manually connected to.
-  _karma_web_test(
-      name = "%s_bin" % name,
-      tags = ["manual"],
-      **kwargs
-  )
-
-  # Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1429
-  native.sh_test(
-      name = "%s" % name,
-      srcs = ["%s_bin" % name],
-      tags = tags + ["ibazel_notify_changes"],
-  )
+    tags = kwargs.pop("tags", [])
+    timeout = kwargs.pop("timeout", None)
 
+    # Custom standalone web test that can be run to test against any browser
+    # that is manually connected to.
+    _karma_web_test(
+        name = "%s_bin" % name,
+        tags = ["manual"],
+        timeout = timeout,
+        **kwargs
+    )
+
+    # Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1429
+    native.sh_test(
+        name = "%s" % name,
+        srcs = ["%s_bin" % name],
+        timeout = timeout,
+        tags = tags + ["ibazel_notify_changes"],
+    )
 
 def karma_web_test_suite(name, **kwargs):
     web_test_args = {}
@@ -204,13 +211,8 @@ def karma_web_test_suite(name, **kwargs):
     )
 
     sauce_web_test_args = dict(**web_test_args)
-    sauce_web_test_args["data"] = sauce_web_test_args.get("data", []) + [
-      "//:saucelabs_tunnel_identifier",
-      "//test:browser-providers.js",
-      "//test:karma-browsers.json"
-    ]
     sauce_web_test_args["deps"] = sauce_web_test_args.get("deps", []) + [
-      "@npm//karma-sauce-launcher"
+        "//test:karma-saucelabs-config",
     ]
 
     # Add a saucelabs target for these karma tests
@@ -219,6 +221,7 @@ def karma_web_test_suite(name, **kwargs):
         timeout = "long",
         config_file = "//test:karma-saucelabs.conf.js",
         tags = ["manual", "saucelabs", "no-remote-exec"],
+        flaky = False,
         **sauce_web_test_args
     )
 

test/karma-browsers.json

@@ -0,0 +1,12 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "saucelabs-bazel",
+    srcs = [
+        "browser.ts",
+        "ipc-messages.ts",
+    ],
+    deps = [],
+)

test/karma-saucelabs.conf.js

@@ -0,0 +1,14 @@
+load("//tools:defaults.bzl", "ts_library")
+
+package(default_visibility = ["//visibility:public"])
+
+ts_library(
+    name = "background-service",
+    srcs = glob(["**/*.ts"]),
+    deps = [
+        "//tools/saucelabs-bazel",
+        "@npm//@types/node",
+        "@npm//@types/selenium-webdriver",
+        "@npm//chalk",
+    ],
+)