Speed-up execute of categories in CIX

diff --git a/cix.sh b/cix.sh
index 8bd7fa7dc6739f3e8b687410667af4cb0b455746..073f4b76a525f131f0df4ca26dbdd25d88a776a2 100755 (executable)
--- a/cix.sh
+++ b/cix.sh
@@ -3,16 +3,6 @@
 
 set -euo pipefail
 
-function runCategory {
-  mvn verify \
-    -f tests/pom.xml \
-    -Dcategory=$CATEGORY \
-    -Dorchestrator.configUrl=http://infra.internal.sonarsource.com/jenkins/orch-$DB_ENGINE.properties \
-    -Dorchestrator.workspace=target/$CATEGORY \
-    -Dwith-db-drivers \
-    -B -e -V
-}
-
 case "$RUN_ACTIVITY" in
 
   run-db-unit-tests-*)
@@ -32,35 +22,27 @@ case "$RUN_ACTIVITY" in
 
       case "$CATEGORY_GROUP" in
         Category1)
-          CATEGORY=Category1 && runCategory
-          CATEGORY=authorization && runCategory
-          CATEGORY=measure && runCategory
-          CATEGORY=qualityGate && runCategory
-          CATEGORY=source && runCategory
+          CATEGORY="Category1|authorization|measure|qualityGate|source"
           ;;
 
         Category2)
-          CATEGORY=Category2 && runCategory
-          CATEGORY=test && runCategory
-          CATEGORY=qualityModel && runCategory
+          CATEGORY="Category2|test|qualityModel"
           ;;
 
         Category3)
-          CATEGORY=Category3 && runCategory
+          CATEGORY="Category3"
           ;;
 
         Category4)
-          CATEGORY=Category4 && runCategory
-          CATEGORY=duplication && runCategory
+          CATEGORY="Category4|duplication"
           ;;
 
         Category5)
-          CATEGORY=Category5 && runCategory
+          CATEGORY="Category5"
           ;;
 
         Category6)
-          CATEGORY=Category6 && runCategory
-          CATEGORY=organization && runCategory
+          CATEGORY="Category6|organization"
           ;;
 
         *)
@@ -69,6 +51,12 @@ case "$RUN_ACTIVITY" in
           ;;
       esac
 
+      mvn verify \
+          -f tests/pom.xml \
+          -Dcategory="$CATEGORY" \
+          -Dorchestrator.configUrl="http://infra.internal.sonarsource.com/jenkins/orch-$DB_ENGINE.properties" \
+          -Pwith-db-drivers \
+          -B -e -V
     fi
     ;;
 

diff --git a/run-integration-tests.sh b/run-integration-tests.sh
index 98bf40a7ba8aa6d36ad8b5b095910081bcad1bb4..82ea7a8b1a29e4c5b8d8e8649318f3a8e36aa79a 100755 (executable)
--- a/run-integration-tests.sh
+++ b/run-integration-tests.sh
@@ -21,7 +21,7 @@ mvn clean package -B -e -V
 
 cd ..
 mvn verify \
-  -Dcategory=$CATEGORY \
+  -Dcategory="$CATEGORY" \
   -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \
-  -Dwith-db-drivers \
+  -Pwith-db-drivers \
   -B -e -V $*

diff --git a/tests/pom.xml b/tests/pom.xml
index 225776d69f2ce4426419f4f1b98dc4bdd7012ea8..36edfa2bc3f08bce173d6969f0881c2ca9295275 100644 (file)
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -167,10 +167,10 @@
           </argLine>
           <skipTests>${skipIts}</skipTests>
           <includes>
-            <include>*/${category}/*Suite.java</include>
+            <include>%regex[.*/(${category})/.*Suite.class]</include>
 
             <!-- deprecated categories -->
-            <include>*/*${category}Suite.java</include>
+            <include>%regex[.*/(${category})Suite.class]</include>
           </includes>
         </configuration>
       </plugin>

diff --git a/tests/src/test/java/org/sonarqube/tests/Category1Suite.java b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java
index 2f48113bddc678456d87c33f41000ebe29621859..2393e6818795758217fa5ac4a83cbcc574278eaf 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category1Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java
@@ -38,6 +38,11 @@ import org.sonarqube.tests.user.UsersPageTest;
 import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.xooPlugin;
 
+/**
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
+ */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   // administration

diff --git a/tests/src/test/java/org/sonarqube/tests/Category2Suite.java b/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
index 7960b0ddf0b255981eddc6e5e09e8392f8c1eb78..03fd21935d780ee43009992a1b16e665f31192f6 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
@@ -47,6 +47,11 @@ import org.sonarqube.tests.rule.RulesPageTest;
 import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.xooPlugin;
 
+/**
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
+ */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   // issue

diff --git a/tests/src/test/java/org/sonarqube/tests/Category3Suite.java b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java
index e5fbb821543ddbb1b995238c863865429ab16bc9..fe4e68350b5534c6b14cf3fe622eed1b9fe143b6 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category3Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java
@@ -43,6 +43,11 @@ import org.sonarqube.tests.webhook.WebhooksTest;
 import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.xooPlugin;
 
+/**
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
+ */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   // analysis

diff --git a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
index f1ff5a039d89626abf1e7d2a845eeb8d1f5ddb01..6c2d14ae4ba5a8e8e9e70e3a7765f0a53c0b9dcc 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
@@ -51,6 +51,11 @@ import org.sonarqube.tests.ws.WsTest;
 import static util.ItUtils.pluginArtifact;
 import static util.ItUtils.xooPlugin;
 
+/**
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
+ */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   // organization

diff --git a/tests/src/test/java/org/sonarqube/tests/Category5Suite.java b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
index a5bc316c09f6b7953f26da36393a04bb76b01ce2..feb6936b30babae88b5017494d60dc8c925cf2d7 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
@@ -45,7 +45,11 @@ import org.sonarqube.tests.user.UserEsResilienceTest;
  * This suite is reserved to the tests that start their own instance of Orchestrator.
  * Indeed multiple instances of Orchestrator can't be started in parallel, so this
  * suite does not declare a shared Orchestrator.
+ *
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
  */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   ServerSystemRestartingOrchestrator.class,

diff --git a/tests/src/test/java/org/sonarqube/tests/Category6Suite.java b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java
index dd582a25cd380709a55dba872973c92dfeab2cb7..87ebf3ac247e214ead6e4488d77df7bc48adeb9a 100644 (file)
--- a/tests/src/test/java/org/sonarqube/tests/Category6Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java
@@ -49,7 +49,11 @@ import static util.ItUtils.xooPlugin;
 
 /**
  * This category is used only when organizations feature is activated
+ *
+ * @deprecated use dedicated suites in each package (see {@link org.sonarqube.tests.measure.MeasureSuite}
+ * for instance)
  */
+@Deprecated
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
   OrganizationIdentityProviderTest.class,