chore(Sauce_Connect): Updating scripts that connect to sauce labs.

Author: Portugal, Marcelo

.travis.yml

@@ -62,4 +62,5 @@ after_failure:
   - ./travis_print_logs.sh
 
 after_script:
+  - killall -9 sc
   - ./travis_print_logs.sh

lib/grunt/utils.js

@@ -126,18 +126,18 @@ var util = module.exports = {
         platform: 'Windows 8.1',
         version: '11'
       },
-      'SL_Android_4': {
-        base: 'SauceLabs',
-        browserName: 'android',
-        platform: 'Linux',
-        version: '4.0'
-      },
-      'SL_Android_4.3': {
-        base: 'SauceLabs',
-        browserName: 'android',
-        platform: 'Linux',
-        version: '4.3'
-      },
+      // 'SL_Android_4': {
+      //   base: 'SauceLabs',
+      //   browserName: 'android',
+      //   platform: 'Linux',
+      //   version: '4.0'
+      // },
+      // 'SL_Android_4.3': {
+      //   base: 'SauceLabs',
+      //   browserName: 'android',
+      //   platform: 'Linux',
+      //   version: '4.3'
+      // },
       'SL_Linux_Opera': {
         base: 'SauceLabs',
         browserName: 'opera',

lib/sauce/sauce_connect_block.sh

@@ -6,4 +6,4 @@ then
   while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do
     sleep .5
   done
-fi
+fi

lib/sauce/sauce_connect_setup.sh

@@ -12,15 +12,15 @@ set -e
 # before_script:
 #   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
 
-# Skip this if we're un a pull request, we won't be able to connect
+# Skip this if we're on a pull request, we won't be able to connect
 if [ $TRAVIS_PULL_REQUEST != "false" ]
 then
   exit 0
 fi
 
-CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip"
+CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.5-linux.tar.gz"
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="Sauce_Connect.zip"
+CONNECT_DOWNLOAD="sc-4.4.5-linux.tar.gz"
 
 if [ -z "$LOGS_DIR" ]
 then
@@ -35,8 +35,8 @@ CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
 # Get Connect and start it
 mkdir -p $CONNECT_DIR
 cd $CONNECT_DIR
-curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
-unzip $CONNECT_DOWNLOAD > /dev/null
+wget $CONNECT_URL 1> /dev/null
+tar -xvzf $CONNECT_DOWNLOAD --strip 1
 rm $CONNECT_DOWNLOAD
 
 # Don't think we need this with a secure env var
@@ -58,5 +58,5 @@ echo "Starting Sauce Connect in the background, logging into:"
 echo "  $CONNECT_LOG"
 echo "  $CONNECT_STDOUT"
 echo "  $CONNECT_STDERR"
-java -jar Sauce-Connect.jar $ARGS $SAUCE_USERNAME $SAUCE_ACCESS_KEY \
-  --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
+./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
+  --logfile $CONNECT_LOG &