From c041461b21ba9691793f94c816780dfe487ad65e Mon Sep 17 00:00:00 2001 From: Andrew Joslin Date: Thu, 29 May 2014 21:12:58 -0600 Subject: [PATCH] chore(): update sauce environment variables --- config/gulp-tasks/test.js | 2 +- config/karma-sauce.conf.js | 2 +- config/protractor-sauce.conf.js | 4 ++-- scripts/shippable/ci.sh | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/gulp-tasks/test.js b/config/gulp-tasks/test.js index 227c30862a..bf1ab10136 100644 --- a/config/gulp-tasks/test.js +++ b/config/gulp-tasks/test.js @@ -19,7 +19,7 @@ module.exports = function(gulp, argv) { require('sauce-connect-launcher')({ username: process.env.SAUCE_USER, accessKey: process.env.SAUCE_KEY, - tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER + tunnelIdentifier: process.env.SAUCE_TUNNEL_ID }, function(err, instance) { if (err) return done('Failed to launch sauce connect!'); sauceInstance = instance; diff --git a/config/karma-sauce.conf.js b/config/karma-sauce.conf.js index f07e7ae09c..b14ba8fe09 100644 --- a/config/karma-sauce.conf.js +++ b/config/karma-sauce.conf.js @@ -8,7 +8,7 @@ module.exports = _.assign({}, shared, { username: process.env.SAUCE_USER, accessKey: process.env.SAUCE_KEY, startConnect: false, - tunnelIdentifier: process.env.TRAVIS_BUILD_NUMBER + tunnelIdentifier: process.env.SAUCE_TUNNEL_ID || 0 }, //Saucelabs mobile emulation (esp android emulator) //can be really slow sometimes, we need to give it time to connectk diff --git a/config/protractor-sauce.conf.js b/config/protractor-sauce.conf.js index 5a17a57e3b..5ba37fe356 100644 --- a/config/protractor-sauce.conf.js +++ b/config/protractor-sauce.conf.js @@ -8,8 +8,8 @@ exports.config = _.merge({}, config, { sauceKey: process.env.SAUCE_KEY, capabilities: { - build: process.env.TRAVIS_BUILD_NUMBER, - 'tunnel-identifier': process.env.TRAVIS_BUILD_NUMBER, + build: process.env.SAUCE_BUILD_ID || 1, + 'tunnel-identifier': process.env.SAUCE_TUNNEL_ID || 0, name: 'Ionic!', browserName: 'chrome' } diff --git a/scripts/shippable/ci.sh b/scripts/shippable/ci.sh index 15cb536b97..f6f1618022 100755 --- a/scripts/shippable/ci.sh +++ b/scripts/shippable/ci.sh @@ -13,7 +13,9 @@ function init { function run { cd ../.. - SNAPSHOT_TEST_ID=$(git rev-parse HEAD) + export SNAPSHOT_TEST_ID=$(git rev-parse HEAD) + export SAUCE_TUNNEL_ID=$CIRCLE_BUILD_DUM + export SAUCE_BUILD_ID=$CIRCLE_SHA1 gulp demos --demo-version=nightly