Skip to content

Commit 4db1296

Browse files
committed
WIP
1 parent f93f15d commit 4db1296

20 files changed

+454
-371
lines changed

.circleci/config.yml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ var_20: &only_on_pull_requests_filter
141141
# -----------------------------
142142
# Container version of CircleCI
143143
# -----------------------------
144-
version: 2
144+
version: 2.1
145145

146146
# -----------------------------------------------------------------------------------------
147147
# Job definitions. Jobs which are defined just here, will not run automatically. Each job
@@ -252,17 +252,35 @@ jobs:
252252
resource_class: xlarge
253253
environment:
254254
SAUCE_USERNAME: "angular-components"
255-
SAUCE_ACCESS_KEY: "63348201a846-eeb9-3ee4-300f-ea990b8a"
256-
# Note: This number should not be too high because otherwise we might run into
257-
# a rate limit exception.
258-
KARMA_PARALLEL_BROWSERS: 2
255+
SAUCE_ACCESS_KEY: "a8b099ae-f003-4ee3-9bee-648a10284336"
256+
SAUCE_TUNNEL_IDENTIFIER: angular-material-<< pipeline.id >>
259257
steps:
260258
- *checkout_code
261259
- *restore_cache
262260
- *setup_bazel_ci_config
263261
- *yarn_install
264262

265-
- run: ./scripts/circleci/run-saucelabs-tests.sh
263+
- run:
264+
name: Saucelabs tunnel
265+
command: ./scripts/saucelabs/start-tunnel.sh
266+
background: true
267+
- run:
268+
name: Waiting for Saucelabs tunnel
269+
command: ./scripts/saucelabs/wait-tunnel.sh
270+
- run:
271+
name: Saucelabs browser daemon
272+
command: yarn -s sauce-bazel-daemon
273+
background: true
274+
275+
- run:
276+
name: Running tests
277+
command: |
278+
TESTS=$(yarn -s bazel query --output label 'attr("tags", "saucelabs", //src/...)')
279+
yarn -s bazel test ${TESTS} --jobs=2
280+
281+
- run:
282+
name: Shutting down tunnel
283+
command: ./scripts/saucelabs/stop-tunnel.sh
266284

267285
# ----------------------------------
268286
# Lint job.

BUILD.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,3 @@ genrule(
2727
outs = ["entry_points_manifest.json"],
2828
cmd = "echo '%s' > $@" % entryPoints,
2929
)
30-
31-
genrule(
32-
name = "saucelabs_tunnel_identifier",
33-
outs = ["saucelabs_tunnel_identifier.txt"],
34-
cmd = "$(execpath //scripts/saucelabs:extract-tunnel-identifier) > $@",
35-
stamp = True,
36-
tools = ["//scripts/saucelabs:extract-tunnel-identifier"],
37-
)

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"ts-circular-deps:approve": "yarn -s ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
4646
"ng-dev": "ts-node -O {\\\"module\\\":\\\"commonjs\\\"} ./node_modules/@angular/dev-infra-private/cli.js",
4747
"merge": "ng-dev pr merge",
48-
"approve-api": "node ./scripts/approve-api-golden.js"
48+
"approve-api": "node ./scripts/approve-api-golden.js",
49+
"sauce-bazel-daemon": "ts-node --project tools/saucelabs-bazel/tsconfig.json tools/saucelabs-bazel/background-service/cli.ts"
4950
},
5051
"version": "10.0.0-next.1",
5152
"dependencies": {

scripts/circleci/run-saucelabs-tests.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

scripts/saucelabs/BUILD.bazel

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/saucelabs/extract-tunnel-identifier.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)