Skip to content

Commit 6127528

Browse files
committed
chore(travis): switch back to SauceLabs
I think we are pretty close to be able to use both. The xhr-polling seems to be pretty stable, but I'm having problems with multiple SSH tunnels (on BS), so let's try to switch back to SL.
1 parent 0410572 commit 6127528

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
before_script:
1515
- mkdir -p $LOGS_DIR
16-
- ./lib/browser-stack/start-tunnel.sh
16+
- ./lib/sauce/sauce_connect_setup.sh
1717
- npm install -g grunt-cli
1818
- grunt bower
1919
- grunt bower

karma-shared.conf.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ module.exports = function(config, specificOptions) {
122122
config.transports = ['websocket', 'xhr-polling'];
123123
config.browserStack.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')';
124124

125+
// TODO(vojta): remove once SauceLabs supports websockets.
126+
// This speeds up the capturing a bit, as browsers don't even try to use websocket.
127+
config.transports = ['xhr-polling'];
128+
125129
// Debug logging into a file, that we print out at the end of the build.
126130
config.loggers.push({
127131
type: 'file',

lib/grunt/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ module.exports = {
295295
stream: options && options.stream
296296
};
297297

298-
args.push('--port=' + this.availablePorts.pop());
298+
args.push('--port=' + this.sauceLabsAvailablePorts.pop());
299299

300300
if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) {
301301
args.push('--browsers=' + grunt.option('e2e-browsers'));

travis_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ set -e
55
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
66

77
grunt parallel:travis --reporters dots \
8-
--browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11 \
9-
--e2e-browsers BS_Chrome
8+
--browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \
9+
--e2e-browsers SL_Chrome

0 commit comments

Comments
 (0)