diff --git a/.travis.yml b/.travis.yml index 9ecd541ab..2eafcf2b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ env: global: - secure: zGX8AFKQnuh6WWLJw58WnRZiVQ4dIbN0gIQ0NpJIKmzQw2yQ+rqQEo2UoT5p\n+SSX/DJnU0yZzZ2RkiN8sabyY3e3Y2JhjO5GUTdoUxxB7ffCDLM4W1T8ckyl\nmSUW/ajrxMbGxruYbKQfepCRK6w4OoUsROYI0MpeoDo8ngxmcFw=" - SAUCE_USER: pita - +jdk: + - oraclejdk6 notifications: email: - petermartischka@googlemail.com \ No newline at end of file diff --git a/tests/frontend/travis/sauce_tunnel.sh b/tests/frontend/travis/sauce_tunnel.sh index 02bcb77f5..306226e69 100644 --- a/tests/frontend/travis/sauce_tunnel.sh +++ b/tests/frontend/travis/sauce_tunnel.sh @@ -4,8 +4,9 @@ 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 & | grep -v $SAUCE_KEY +(java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY | grep -v $SAUCE_KEY)& #save the sauce pid in a file and give it a bit of time to connect echo $! > /tmp/sauce.pid -wait 30 \ No newline at end of file +wait 30 +kill $! \ No newline at end of file