diff options
| author | John McLear <john@mclear.co.uk> | 2013-06-15 00:17:28 -0700 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2013-06-15 00:17:28 -0700 |
| commit | 71c62af8df0758bdc3a87a584df9233fe9fc316c (patch) | |
| tree | 9731fc923a97c7f341dbb682c9dfe6878405748d | |
| parent | ae78c6731d8d96628526f468a62b966d246b60d4 (diff) | |
| parent | 837d3bcfbffd6af980e823a31a3a65af750708d5 (diff) | |
| download | etherpad-lite-71c62af8df0758bdc3a87a584df9233fe9fc316c.zip | |
Merge pull request #1810 from clkao/travis-fixes
Fix sauce configuration
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | tests/frontend/travis/remote_runner.js | 2 | ||||
| -rwxr-xr-x | tests/frontend/travis/sauce_tunnel.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 1c40a4ec..74f68f86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,14 +4,14 @@ node_js: install: - "bin/installDeps.sh" - "export GIT_HASH=$(cat .git/HEAD | head -c 7)" -before_script: +before_script: - "tests/frontend/travis/sauce_tunnel.sh" script: - "tests/frontend/travis/runner.sh" env: global: - - secure: "gVR70BdAh093qBS5P5+V5NzmCYnLFFeIZn3XdgTpgpGRm7UE8GP53TEobtPf\neqpEpbWRTsEbdf+QPisVWrBZcNPFU4I3nucIqdyVobIcQD0TbBQYudm0yLQd\n3Ocqck0BIx9Ni9hBklJupmKt89LDQxNvkEb+uJJqlQwo2RZd36U=" - - SAUCE_USER=etherpad + - secure: "WMGxFkOeTTlhWB+ChMucRtIqVmMbwzYdNHuHQjKCcj8HBEPdZLfCuK/kf4rG\nVLcLQiIsyllqzNhBGVHG1nyqWr0/LTm8JRqSCDDVIhpyzp9KpCJQQJG2Uwjk\n6/HIJJh/wbxsEdLNV2crYU/EiVO3A4Bq0YTHUlbhUqG3mSCr5Ec=" + - secure: "gejXUAHYscbR6Bodw35XexpToqWkv2ifeECsbeEmjaLkYzXmUUNWJGknKSu7\nEUsSfQV8w+hxApr1Z+jNqk9aX3K1I4btL3cwk2trnNI8XRAvu1c1Iv60eerI\nkE82Rsd5lwUaMEh+/HoL8ztFCZamVndoNgX7HWp5J/NRZZMmh4g=" jdk: - oraclejdk6 notifications: diff --git a/tests/frontend/travis/remote_runner.js b/tests/frontend/travis/remote_runner.js index a4f1dac1..f7edae22 100644 --- a/tests/frontend/travis/remote_runner.js +++ b/tests/frontend/travis/remote_runner.js @@ -6,7 +6,7 @@ var config = { host: "ondemand.saucelabs.com" , port: 80 , username: process.env.SAUCE_USER - , accessKey: process.env.SAUCE_KEY + , accessKey: process.env.SAUCE_ACCESS_KEY } var allTestsPassed = true; diff --git a/tests/frontend/travis/sauce_tunnel.sh b/tests/frontend/travis/sauce_tunnel.sh index ac8f7ac7..f519f8d9 100755 --- a/tests/frontend/travis/sauce_tunnel.sh +++ b/tests/frontend/travis/sauce_tunnel.sh @@ -4,7 +4,7 @@ curl http://saucelabs.com/downloads/Sauce-Connect-latest.zip > /tmp/sauce.zip unzip /tmp/sauce.zip -d /tmp # start the sauce connector in background and make sure it doesn't output the secret key -(java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY -f /tmp/tunnel > /dev/null )& +(java -jar /tmp/Sauce-Connect.jar $SAUCE_USERNAME $SAUCE_ACCESS_KEY -f /tmp/tunnel > /dev/null )& # save the sauce pid in a file echo $! > /tmp/sauce.pid |