Merge pull request #1810 from clkao/travis-fixes

Fix sauce configuration

.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:

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;

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