re-enable custom tunneling

Author: Narretz

karma-shared.conf.js

@@ -178,7 +178,6 @@ module.exports = function(config, specificOptions) {
     var buildLabel = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
 
     config.concurrency = 3;
-    config.retryLimit = 5;
 
     // Karma (with socket.io 1.x) buffers by 50 and 50 tests can take a long time on IEs;-)
     config.browserNoActivityTimeout = 120000;
@@ -188,8 +187,8 @@ module.exports = function(config, specificOptions) {
     config.browserStack.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
 
     config.sauceLabs.build = buildLabel;
-    // config.sauceLabs.startConnect = false;
-    // config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
+    config.sauceLabs.startConnect = false;
+    config.sauceLabs.tunnelIdentifier = process.env.TRAVIS_JOB_NUMBER;
     // config.sauceLabs.recordScreenshots = false;
     // config.sauceLabs.recordVideo = false;
 

scripts/travis/before_build.sh

@@ -6,7 +6,7 @@ mkdir -p "$LOGS_DIR"
 
 if [ "$JOB" != "ci-checks" ]; then
   echo "start_browser_provider"
-  # ./scripts/travis/start_browser_provider.sh
+  ./scripts/travis/start_browser_provider.sh
 fi
 
 # ci-checks and unit tests do not run against the packaged code
@@ -24,5 +24,5 @@ fi
 # has probably arrived
 if [ "$JOB" != "ci-checks" ]; then
   echo "wait_for_browser_provider"
-  # ./scripts/travis/wait_for_browser_provider.sh
+  ./scripts/travis/wait_for_browser_provider.sh
 fi