fixup! WIP: move saucelabs tests to circle

CircleCI does not seem to log output of background scripts which are not spawned through CircleCI's background flag
angular · Jan 5, 2019 · 39557e7 · 39557e7
1 parent fcda67b
commit 39557e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -425,10 +425,15 @@ jobs:
       - *yarn_install
       - *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/saucelabs/start-tunnel.sh
+      - run:
+          name: Starting Saucelabs tunnel
+          command: ./scripts/saucelabs/start-tunnel.sh
+          background: true
       - run: yarn tsc -p packages
       - run: yarn tsc -p packages/examples
       - run: yarn tsc -p modules
+        # Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
+        # too early without Saucelabs not being ready.
       - run: ./scripts/saucelabs/wait-tunnel.sh
       - run: yarn karma start ./karma-js.conf.js --single-run --browsers=${KARMA_JS_BROWSERS}
       - run: ./scripts/saucelabs/stop-tunnel.sh

diff --git a/scripts/saucelabs/start-tunnel.sh b/scripts/saucelabs/start-tunnel.sh
@@ -39,6 +39,6 @@ if [[ ! -z "${SAUCE_TUNNEL_IDENTIFIER}" ]]; then
   sauceArgs="${sauceArgs} --tunnel-identifier ${SAUCE_TUNNEL_IDENTIFIER}"
 fi
 
-echo "Starting Sauce Connect in the background. Passed arguments: ${sauceArgs}"
+echo "Starting Sauce Connect. Passed arguments: ${sauceArgs}"
 
-sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs} &
+sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs}