diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | travis.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index b177290b86d..61761516730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: java sudo: false install: true - -jdk: - - oraclejdk7 +jdk: oraclejdk7 +script: ./travis.sh env: - JOB=H2 @@ -22,9 +21,6 @@ env: matrix: fast_finish: true -script: - - ./travis.sh - cache: directories: - '$HOME/.m2/repository' diff --git a/travis.sh b/travis.sh index fbdcfff667d..0073a88f6c0 100755 --- a/travis.sh +++ b/travis.sh @@ -48,7 +48,7 @@ WEB) ;; PRANALYSIS) - if [ -n "$SONAR_GITHUB_OAUTH" ] && [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then + if [ -n "$SONAR_GITHUB_OAUTH" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "Start pullrequest analysis" mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar -B -e -V -Dmaven.test.failure.ignore=true -Dclirr=true \ -Dsonar.analysis.mode=incremental \ @@ -63,8 +63,12 @@ PRANALYSIS) ;; ITS) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory=$IT_CATEGORY -Dmaven.test.redirectTestOutputToFile=false -e + if [ "$IT_CATEGORY" == "plugins" ] && [ "$TRAVIS_PULL_REQUEST" == "true" ]; then + echo "Ignore this job since it needs access to private test licenses." + else + prepareIts + mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory=$IT_CATEGORY -Dmaven.test.redirectTestOutputToFile=false -e + fi ;; esac |