diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-07-27 09:49:15 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-07-27 11:42:09 +0200 |
| commit | 7d7986f3613241fdf4e7b32cbb0168c2f3fde3ea (patch) | |
| tree | 8cef560716c3dd172d566c7a7e4f4f60d69ebbf8 | |
| parent | d9099e9259250a4aa78bfecf1ae3531d4c80bfdb (diff) | |
| download | sonarqube-7d7986f3613241fdf4e7b32cbb0168c2f3fde3ea.tar.gz sonarqube-7d7986f3613241fdf4e7b32cbb0168c2f3fde3ea.zip | |
Simplify Travis env for integration tests
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rwxr-xr-x | travis.sh | 34 |
2 files changed, 9 insertions, 39 deletions
diff --git a/.travis.yml b/.travis.yml index a857f44c28f..6d5f2a15f13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,13 @@ env: - JOB=POSTGRES - JOB=MYSQL - JOB=WEB - - JOB=ITS_ISSUE - - JOB=ITS_QUALITYGATE - - JOB=ITS_UPDATECENTER - - JOB=ITS_TESTING - - JOB=ITS_MEASURE - - JOB=ITS_UI - - JOB=ITS_PLUGINS + - JOB=ITS IT_CATEGORY=issue + - JOB=ITS IT_CATEGORY=measure + - JOB=ITS IT_CATEGORY=plugins + - JOB=ITS IT_CATEGORY=qualitygate + - JOB=ITS IT_CATEGORY=testing + - JOB=ITS IT_CATEGORY=ui + - JOB=ITS IT_CATEGORY=updatecenter matrix: fast_finish: true diff --git a/travis.sh b/travis.sh index 2fb5d18cc00..6812ccff7ac 100755 --- a/travis.sh +++ b/travis.sh @@ -62,39 +62,9 @@ PRANALYSIS) fi ;; -ITS_QUALITYGATE) +ITS) prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="qualitygate" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_ISSUE) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="issue" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_UPDATECENTER) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="updatecenter" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_TESTING) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="testing" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_MEASURE) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="measure" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_UI) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="ui" -Dmaven.test.redirectTestOutputToFile=false - ;; - -ITS_PLUGINS) - prepareIts - mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory="plugins" -Dmaven.test.redirectTestOutputToFile=false + mvn install -Pit,dev -DskipTests -Dsonar.runtimeVersion=DEV -Dcategory=$IT_CATEGORY -Dmaven.test.redirectTestOutputToFile=false -e ;; esac |