Move ITs on QA

diff --git a/.travis.yml b/.travis.yml
index 34635b7742debbe41ba05384aac73183aced0232..d31c90eb0cc7b0db01d0e4d03b100e756ffb0ae2 100644 (file)
--- 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 (file)
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 d6cdc06f8aee773b28d78138ca06c33cdad67a40..3ba067ac2e9ba2df104a9ed169455bfd5e43cc1e 100755 (executable)
--- 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