Skip to content

Commit 2666976

Browse files
committed
build: increase saucelabs connect timeout
At some point we went down from a 2min wait timeout to 30seconds because we re-ran the startup script if something failed. Since re-running didn't really help and we removed it, we should move the timeout back to a longer period. e.g. see: https://circleci.com/gh/angular/material2/25254 where it successfully acquired a tunnel, but just didn't have enough time to actually establish it.
1 parent bc563b7 commit 2666976

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

scripts/saucelabs/start-tunnel.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ tunnelFileName="sc-4.5.2-linux.tar.gz"
66
tunnelUrl="https://saucelabs.com/downloads/${tunnelFileName}"
77

88
tunnelTmpDir="/tmp/material-saucelabs"
9-
tunnelLogFile="${tunnelTmpDir}/saucelabs-connect.log"
109
tunnelReadyFile="${tunnelTmpDir}/readyfile"
1110
tunnelPidFile="${tunnelTmpDir}/pidfile"
1211

@@ -34,7 +33,6 @@ if [ ! -z "${CIRCLE_BUILD_NUM}" ]; then
3433
sauceArgs="${sauceArgs} --tunnel-identifier angular-material-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
3534
fi
3635

37-
echo "Starting Sauce Connect in the background, logging into: ${tunnelLogFile}"
36+
echo "Starting Sauce Connect in the background. Passed arguments: ${sauceArgs}"
3837

39-
sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs} 2>&1 >> \
40-
${tunnelLogFile} &
38+
sauce-connect/bin/sc -u ${SAUCE_USERNAME} -k ${SAUCE_ACCESS_KEY} ${sauceArgs} &

scripts/saucelabs/wait-tunnel.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
#!/bin/bash
22

33
tunnelTmpDir="/tmp/material-saucelabs"
4-
tunnelLogFile="${tunnelTmpDir}/saucelabs-connect.log"
54
tunnelReadyFile="${tunnelTmpDir}/readyfile"
65

7-
WAIT_DELAY=30
8-
9-
# Method that prints the logfile output of the saucelabs tunnel.
10-
printLog() {
11-
echo "Logfile output of Saucelabs tunnel (${tunnelLogFile}):"
12-
echo ""
13-
cat ${tunnelLogFile}
14-
}
6+
WAIT_DELAY=120
157

168
# Wait for Saucelabs Connect to be ready before exiting
179
# Time out if we wait for more than 2 minutes, so the process won't run forever.
@@ -25,7 +17,6 @@ while [ ! -f ${tunnelReadyFile} ]; do
2517
if [ $counter -gt $[${WAIT_DELAY} * 2] ]; then
2618
echo ""
2719
echo "Timed out after 2 minutes waiting for tunnel ready file"
28-
printLog
2920
exit 5
3021
fi
3122

0 commit comments

Comments
 (0)