Run ITs with SQ 5.2/5.1.2/LTS

diff --git a/.travis.yml b/.travis.yml
index 41efeed6de9b22356f97455aecd58135c14b4b41..7dc0f7c02da7adf84fb96b48982eb923327e7274 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ script: ./travis.sh
 env:
   - TESTS=CI
   - TESTS=IT-DEV
+  - TESTS=IT-DEV-SQ51
+  - TESTS=IT-DEV-LTS
 
 matrix:
   fast_finish: true

diff --git a/it/src/test/java/com/sonar/runner/it/CacheTest.java b/it/src/test/java/com/sonar/runner/it/CacheTest.java
index df6186fbe14871f21cd46679f5a1a3de4c0e87ba..1b2f6caa7492a085857a4e355bc6675379aaa922 100644 (file)
--- a/it/src/test/java/com/sonar/runner/it/CacheTest.java
+++ b/it/src/test/java/com/sonar/runner/it/CacheTest.java
@@ -19,6 +19,8 @@
  */
 package com.sonar.runner.it;
 
+import org.junit.Assume;
+
 import org.junit.BeforeClass;
 import org.junit.rules.TemporaryFolder;
 import org.junit.Rule;
@@ -64,6 +66,8 @@ public class CacheTest extends RunnerTestCase {
 
   @Test
   public void testIssuesMode() throws IOException {
+    Assume.assumeTrue(orchestrator.getServer().version().isGreaterThanOrEquals("5.2"));
+    
     // online, without cache -> should sync
     ensureStarted();
     SonarRunner build = createRunner("issues", true);
@@ -87,6 +91,8 @@ public class CacheTest extends RunnerTestCase {
 
   @Test
   public void testPublishModeOffline() throws IOException {
+    Assume.assumeTrue(orchestrator.getServer().version().isGreaterThanOrEquals("5.2"));
+    
     // online (cache not used)
     ensureStarted();
     SonarRunner build = createRunner("publish");

diff --git a/it/src/test/java/com/sonar/runner/it/JavaTest.java b/it/src/test/java/com/sonar/runner/it/JavaTest.java
index f5ec9e01f03cbbc2237e27102a7cebc738b99c27..2e82c6422c3268a73f979081a32a57e969fdb2dc 100644 (file)
--- a/it/src/test/java/com/sonar/runner/it/JavaTest.java
+++ b/it/src/test/java/com/sonar/runner/it/JavaTest.java
@@ -53,7 +53,7 @@ public class JavaTest extends RunnerTestCase {
 
     SonarRunner build = newRunner(new File("projects/java-sample"))
       .setProperty("sonar.verbose", "true")
-      .addArguments("-e", "-X");
+      .addArguments("-e");
     // SONARPLUGINS-3061
     // Add a trailing slash
     build.setProperty("sonar.host.url", orchestrator.getServer().getUrl() + "/");

diff --git a/travis.sh b/travis.sh
index 4299683ae5f0d2ba76b7abcf50c4dbc182b1ae9e..a3bb399ca2a275a8f3476d5dab42b8d7bb01e14b 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -29,4 +29,22 @@ IT-DEV)
   mvn -DsonarRunner.version="2.5-SNAPSHOT" -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install
   ;;
 
+IT-DEV-SQ51)
+  installTravisTools
+
+  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+
+  cd it
+  mvn -DsonarRunner.version="2.5-SNAPSHOT" -Dsonar.runtimeVersion="5.1.2" -Dmaven.test.redirectTestOutputToFile=false install
+  ;;
+
+IT-DEV-LTS)
+  installTravisTools
+
+  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+
+  cd it
+  mvn -DsonarRunner.version="2.5-SNAPSHOT" -Dsonar.runtimeVersion="4.5.5" -Dmaven.test.redirectTestOutputToFile=false install
+  ;;
+
 esac