fixup! wip: move unit tests to circle

angular · Jan 5, 2019 · 5e5db78 · 5e5db78
1 parent 23320fc
commit 5e5db78
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -427,11 +427,12 @@ jobs:
           at: dist
       - *define_env_vars
       - run: echo "export KARMA_JS_BROWSERS=`node -e \"console.log(require('./browser-providers.conf').sauceAliases.CI_REQUIRED.join(','))\"`" | tee -a $BASH_ENV
+      - run: ./scripts/sauce/sauce_connect_install.sh
       - run: ./scripts/sauce/sauce_connect_start.sh
-      - run: ./scripts/sauce/sauce_connect_wait_for_tunnel.sh
       - run: yarn tsc -p packages
       - run: yarn tsc -p packages/examples
       - run: yarn tsc -p modules
+      - run: ./scripts/sauce/sauce_connect_wait_for_tunnel.sh
       - run: yarn karma start ./karma-js.conf.js --single-run --browsers=ChromeNoSandbox
       - run: ./scripts/sauce/sauce_connect_teardown.sh
 

diff --git a/.circleci/env.sh b/.circleci/env.sh
@@ -9,6 +9,8 @@ echo "source $envHelpersPath;" >> $BASH_ENV;
 ####################################################################################################
 # Define PUBLIC environment variables for CircleCI.
 ####################################################################################################
+# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info
+####################################################################################################
 setPublicVar PROJECT_ROOT "$(pwd)";
 setPublicVar CI_AIO_MIN_PWA_SCORE "95";
 # This is the branch being built; e.g. `pull/12345` for PR builds.
@@ -20,6 +22,7 @@ setPublicVar CI_COMMIT_RANGE "$(sed -r 's|^.*/([0-9a-f]+\.\.\.[0-9a-f]+)$|\1|i'
 setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
 setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
 setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
+setPublicVar CI_JOB_NUMBER "$CIRCLE_BUILD_NUM";
 
 
 ####################################################################################################
@@ -34,17 +37,21 @@ setSecretVar CI_SECRET_SLACK_CARETAKER_WEBHOOK_URL "$SLACK_CARETAKER_WEBHOOK_URL
 ####################################################################################################
 # Define SauceLabs environment variables for CircleCI.
 ####################################################################################################
+setPublicVar SAUCE_CONNECT_VERSION 4.5.2
 # Used by karma and karma-chrome-launcher
 # In order to have a meaningful SauceLabs badge on the repo page,
 # the angular2-ci account is used only when pushing commits to master;
 # in all other cases, the regular angular-ci account is used.
 if [ "${CI_PULL_REQUEST}" = "false" ] && [ "${CI_BRANCH}" = "master" ]; then
-  setPublicVar SAUCE_USERNAME angular2-ci
-  setSecretVar SAUCE_ACCESS_KEY 693ebc16208a-0b5b-1614-8d66-a2662f4e
+  setPublicVar SAUCE_USERNAME "angular2-ci";
+  setSecretVar SAUCE_ACCESS_KEY "693ebc16208a-0b5b-1614-8d66-a2662f4e";
 else
-  setPublicVar SAUCE_USERNAME angular-ci
-  setSecretVar SAUCE_ACCESS_KEY 9b988f434ff8-fbca-8aa4-4ae3-35442987
+  setPublicVar SAUCE_USERNAME "angular-ci";
+  setSecretVar SAUCE_ACCESS_KEY "9b988f434ff8-fbca-8aa4-4ae3-35442987";
 fi
+SAUCE_READY_FILE /tmp/angular-build/browser-provider-tunnel-init.lock
+
+
 
 # Source `$BASH_ENV` to make the variables available immediately.
 source $BASH_ENV;
diff --git a/scripts/sauce/sauce_connect_start.sh b/scripts/sauce/sauce_connect_start.sh
@@ -21,11 +21,11 @@ SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
 ARGS=""
 
 # Set tunnel-id only on Travis, to make local testing easier.
-if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then
+if [ ! -z "$CI_JOB_NUMBER" ]; then
   ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_NUMBER"
 fi
-if [ ! -z "$BROWSER_PROVIDER_READY_FILE" ]; then
-  ARGS="$ARGS --readyfile $BROWSER_PROVIDER_READY_FILE"
+if [ ! -z "$SAUCE_READY_FILE" ]; then
+  ARGS="$ARGS --readyfile $SAUCE_READY_FILE"
 fi
 
 set -v

diff --git a/scripts/sauce/sauce_connect_wait_for_tunnel.sh b/scripts/sauce/sauce_connect_wait_for_tunnel.sh
@@ -5,7 +5,7 @@ set +x -u -e -o pipefail
 # Wait for the SauceLabs tunnel to be ready before exiting
 echo "Connecting to SauceLabs..."
 
-while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do
+while [ ! -f $SAUCE_READY_FILE ]; do
   echo "... still waiting for the SauceLabs..."
   sleep .5
 done