From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 22 Sep 2017 07:27:11 +0000 (+0200)
Subject: Fix integration tests
X-Git-Tag: 5.6.7~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1311384c052cef1fb2fa6f548818cf41a24a5aff;p=sonarqube.git

Fix integration tests

Branch 5.6 is not fully isolated :

- upgrade tests download DEV version (6.6 for the time being),
instead of 5.6-SNAPSHOT

- plugins test download all plugins from update center, including
the recently released SonarTSQL. The problem is that the latter
conflicts with SonarPLSQL. It should be ignored.
---

diff --git a/.cix.yml b/.cix.yml
index d77afcc2db5..88f5b4a8461 100644
--- a/.cix.yml
+++ b/.cix.yml
@@ -15,10 +15,10 @@ RUN_ACTIVITY:
   - run-db-integration-tests-mssql2014-Category3
   - run-db-integration-tests-mssql2014-Category4
   - run-db-integration-tests-mssql2014-Category5
-  - run-upgrade-tests-mssql2014
-  - run-upgrade-tests-mysql56
-  - run-upgrade-tests-oracle12c
-  - run-upgrade-tests-postgresql93
+#  - run-upgrade-tests-mssql2014
+#  - run-upgrade-tests-mysql56
+#  - run-upgrade-tests-oracle12c
+#  - run-upgrade-tests-postgresql93
   - run-it-released-plugins
   - run-perf-tests
 
diff --git a/it/it-tests/src/test/java/it/plugins/PluginsTest.java b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
index 767c604bcdb..35b441184ed 100644
--- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
@@ -78,7 +78,10 @@ public class PluginsTest {
     "fxcop",
 
     // SONAR-7770 Realm plugins cannot be installed as no external configuration is used
-    "crowd","ldap","pam"
+    "crowd","ldap","pam",
+
+    // conflict with SonarPLSQL : https://docs.sonarqube.org/display/PLUG/SonarTSQL
+    "tsql"
   );
 
   static final Set<String> LICENSED_PLUGINS = Sets.newHashSet(