diff options
| author | David Gageot <david@gageot.net> | 2015-09-10 10:16:31 +0200 |
|---|---|---|
| committer | David Gageot <david@gageot.net> | 2015-09-10 10:37:33 +0200 |
| commit | d7fbf7680b0e527312165f1ca39937c5f24c1d22 (patch) | |
| tree | 7b17f9db8043ddcc663634fada9a806a7be8fd2d /travis.sh | |
| parent | 5d5eaaf74d082a1303ce5142f975f71ac31904d9 (diff) | |
| download | sonarqube-d7fbf7680b0e527312165f1ca39937c5f24c1d22.tar.gz sonarqube-d7fbf7680b0e527312165f1ca39937c5f24c1d22.zip | |
Cleanup travis script
Diffstat (limited to 'travis.sh')
| -rwxr-xr-x | travis.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/travis.sh b/travis.sh index 8d3d4e26986..95e3e0c7b4f 100755 --- a/travis.sh +++ b/travis.sh @@ -8,11 +8,6 @@ function installTravisTools { source ~/.local/bin/install } -function prepareIts { - installTravisTools - start_xvfb -} - case "$JOB" in H2) @@ -39,11 +34,13 @@ MYSQL) ;; WEB) - prepareIts + installTravisTools + /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 wget http://selenium-release.storage.googleapis.com/2.46/selenium-server-standalone-2.46.0.jar nohup java -jar selenium-server-standalone-2.46.0.jar & sleep 3 + cd server/sonar-web && npm install && npm test ;; @@ -66,7 +63,8 @@ ITS) if [ "$IT_CATEGORY" == "plugins" ] && [ "$TRAVIS_PULL_REQUEST" == "true" ]; then echo "Ignore this job since it needs access to private test licenses." else - prepareIts + installTravisTools + start_xvfb CATEGORIES=($(echo "$IT_CATEGORY" | tr '_' '\n')) CATEGORY1=${CATEGORIES[0]:-'NONE'} |