aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rw-r--r--run_integration_tests.sh12
-rwxr-xr-xtravis.sh28
3 files changed, 15 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index 34635b7..d31c90e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,6 @@ jdk:
install: true
script: ./travis.sh
-env:
- matrix:
- - TARGET=CI
- - TARGET=IT
-
cache:
directories:
- $HOME/.m2/repository
diff --git a/run_integration_tests.sh b/run_integration_tests.sh
new file mode 100644
index 0000000..69ddbf2
--- /dev/null
+++ b/run_integration_tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Run integration tests with a given version of SonarQube
+# Usage: run_integration_tests.sh "5.2"
+
+set -euo pipefail
+
+# required version of SonarQube
+SONARQUBE_VERSION=$1
+shift
+
+cd it
+mvn verify -Dsonar.runtimeVersion=$SONARQUBE_VERSION -e -B -V -U $*
diff --git a/travis.sh b/travis.sh
index d6cdc06..3ba067a 100755
--- a/travis.sh
+++ b/travis.sh
@@ -3,34 +3,12 @@
set -euo pipefail
function configureTravis {
- mkdir -p ~/.local
+ mkdir ~/.local
curl -sSL https://github.com/SonarSource/travis-utils/tarball/v27 | tar zx --strip-components 1 -C ~/.local
- source ~/.local/bin/install
+ source ~/.local/bin/install
}
configureTravis
-#build_snapshot SonarSource/sonar-scanner-api
-case "$TARGET" in
-
-CI)
- regular_mvn_build_deploy_analyze
- ;;
-
-IT)
- MIN_SQ_VERSION="LTS"
- mvn install -DskipTests=true -Dsource.skip=true -Denforcer.skip=true -B -e -V
-
- echo '======= Run integration tests on minimal supported version of SonarQube ($MIN_SQ_VERSION)'
- cd it
- mvn -Dsonar.runtimeVersion="$MIN_SQ_VERSION" -Dmaven.test.redirectTestOutputToFile=false verify -e -B -V
- # all other versions of SQ are tested by the QA pipeline at SonarSource
- ;;
-
-*)
- echo "Unexpected TARGET value: $TARGET"
- exit 1
- ;;
-
-esac
+regular_mvn_build_deploy_analyze