fixup! wip: move unit tests to circle

angular · Jan 5, 2019 · bf9e746 · bf9e746
1 parent 91e1c22
commit bf9e746
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/.circleci/env.sh b/.circleci/env.sh
@@ -50,6 +50,7 @@ else
   setSecretVar SAUCE_ACCESS_KEY "9b988f434ff8-fbca-8aa4-4ae3-35442987";
 fi
 setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-tunnel-init.lock
+setPublicVar SAUCE_INSTALL_DIR /tmp/angular/sauce-connect
 
 
 

diff --git a/scripts/sauce/sauce_connect_install.sh b/scripts/sauce/sauce_connect_install.sh
@@ -6,14 +6,12 @@ set -x -u -e -o pipefail
 readonly thisDir=$(cd $(dirname $0); pwd)
 
 
-CONNECT_URL="https://saucelabs.com/downloads/sc-${SAUCE_CONNECT_VERSION}-linux.tar.gz"
-CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
+SAUCE_CONNECT_URL="https://saucelabs.com/downloads/sc-${SAUCE_CONNECT_VERSION}-linux.tar.gz"
+SAUCE_CONNECT_TARBALL="sc-latest-linux.tar.gz"
 
 
-mkdir -p $CONNECT_DIR
-cd $CONNECT_DIR
-curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
-mkdir sauce-connect
-tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 --directory=sauce-connect > /dev/null
-rm $CONNECT_DOWNLOAD
+mkdir -p $SAUCE_INSTALL_DIR
+cd $SAUCE_INSTALL_DIR
+curl $SAUCE_CONNECT_URL -o $SAUCE_CONNECT_TARBALL 2> /dev/null 1> /dev/null
+tar --extract --file=$SAUCE_CONNECT_TARBALL --strip-components=1 > /dev/null
+rm $SAUCE_CONNECT_TARBALL
diff --git a/scripts/sauce/sauce_connect_start.sh b/scripts/sauce/sauce_connect_start.sh
@@ -27,6 +27,6 @@ fi
 
 set -v
 echo "Starting a SauceLabs tunnel in the background..."
-sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS --logfile $CONNECT_LOG \
+$SAUCE_INSTALL_DIR/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS --logfile $CONNECT_LOG \
   > $CONNECT_STDOUT &
 set +v