Skip to content

Commit ccd0bef

Browse files
Portugal, Marcelomportuga
Portugal, Marcelo
authored andcommitted
fix(SauceLabs): Updating Sauce Labs scripts per suggestion.
1 parent ec9179a commit ccd0bef

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ after_failure:
6262
- ./travis_print_logs.sh
6363

6464
after_script:
65+
- killall -9 sc
6566
- ./travis_print_logs.sh

lib/sauce/sauce_connect_setup.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ then
1818
exit 0
1919
fi
2020

21-
CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip"
21+
CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.5-linux.tar.gz"
2222
CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
23-
CONNECT_DOWNLOAD="Sauce_Connect.zip"
23+
CONNECT_DOWNLOAD="sc-4.4.5-linux.tar.gz"
2424

2525
if [ -z "$LOGS_DIR" ]
2626
then
@@ -35,8 +35,8 @@ CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
3535
# Get Connect and start it
3636
mkdir -p $CONNECT_DIR
3737
cd $CONNECT_DIR
38-
curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
39-
unzip $CONNECT_DOWNLOAD > /dev/null
38+
wget $CONNECT_URL 1> /dev/null
39+
tar -xvzf $CONNECT_DOWNLOAD --strip 1
4040
rm $CONNECT_DOWNLOAD
4141

4242
# Don't think we need this with a secure env var
@@ -58,5 +58,5 @@ echo "Starting Sauce Connect in the background, logging into:"
5858
echo " $CONNECT_LOG"
5959
echo " $CONNECT_STDOUT"
6060
echo " $CONNECT_STDERR"
61-
java -jar Sauce-Connect.jar $ARGS $SAUCE_USERNAME $SAUCE_ACCESS_KEY \
62-
--logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
61+
./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
62+
--logfile $CONNECT_LOG &

0 commit comments

Comments
 (0)