From 1311384c052cef1fb2fa6f548818cf41a24a5aff Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 22 Sep 2017 09:27:11 +0200 Subject: [PATCH] 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. --- .cix.yml | 8 ++++---- it/it-tests/src/test/java/it/plugins/PluginsTest.java | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) 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 LICENSED_PLUGINS = Sets.newHashSet( -- 2.39.5