From a1cae28283a25718e3bde4430bedc623fa97f88e Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 17 Mar 2020 12:00:16 -0500 Subject: [PATCH] build: fix saucelabs jobs that were broken by bazelisk change (#36109) PR Close #36109 --- .circleci/config.yml | 4 ++-- tools/saucelabs/README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e79b996da4..43e4a932e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,7 +348,7 @@ jobs: # See /tools/saucelabs/README.md for more info command: | yarn bazel run //tools/saucelabs:sauce_service_setup - TESTS=$(./node_modules/.bin/bazel query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "ivy-only", ...) except attr("tags", "fixme-saucelabs-ve", ...)') + TESTS=$(./node_modules/.bin/bazelisk query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "ivy-only", ...) except attr("tags", "fixme-saucelabs-ve", ...)') yarn bazel test --config=saucelabs ${TESTS} yarn bazel run //tools/saucelabs:sauce_service_stop no_output_timeout: 40m @@ -372,7 +372,7 @@ jobs: # See /tools/saucelabs/README.md for more info command: | yarn bazel run //tools/saucelabs:sauce_service_setup - TESTS=$(./node_modules/.bin/bazel query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "no-ivy-aot", ...) except attr("tags", "fixme-saucelabs-ivy", ...)') + TESTS=$(./node_modules/.bin/bazelisk query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "no-ivy-aot", ...) except attr("tags", "fixme-saucelabs-ivy", ...)') yarn bazel test --config=saucelabs --config=ivy ${TESTS} yarn bazel run //tools/saucelabs:sauce_service_stop no_output_timeout: 40m diff --git a/tools/saucelabs/README.md b/tools/saucelabs/README.md index 25fdda31c6..9ade6aa116 100644 --- a/tools/saucelabs/README.md +++ b/tools/saucelabs/README.md @@ -51,7 +51,7 @@ Running all ViewEngine karma tests in Saucelabs: ``` bash yarn bazel run //tools/saucelabs:sauce_service_setup -TESTS=$(./node_modules/.bin/bazel query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "ivy-only", ...) except attr("tags", "fixme-saucelabs-ve", ...)') +TESTS=$(./node_modules/.bin/bazelisk query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "ivy-only", ...) except attr("tags", "fixme-saucelabs-ve", ...)') yarn bazel test --config=saucelabs ${TESTS} ``` @@ -59,7 +59,7 @@ Running all Ivy karma tests in Saucelabs: ``` bash yarn bazel run //tools/saucelabs:sauce_service_setup -TESTS=$(./node_modules/.bin/bazel query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "no-ivy-aot", ...) except attr("tags", "fixme-saucelabs-ivy", ...)') +TESTS=$(./node_modules/.bin/bazelisk query --output label '(kind(karma_web_test, ...) intersect attr("tags", "saucelabs", ...)) except attr("tags", "no-ivy-aot", ...) except attr("tags", "fixme-saucelabs-ivy", ...)') yarn bazel test --config=saucelabs --config=ivy ${TESTS} ```