Complete matrix of QA tests

diff --git a/.cix.yml b/.cix.yml
index df4b2a27a691d4e0d8ae1e107a1b08377e39d16f..2166a45a59d9180abf59618634edd8386b0f1a78 100644 (file)
--- a/.cix.yml
+++ b/.cix.yml
@@ -10,8 +10,10 @@ RUN_ACTIVITY:
   - run-db-unit-tests-oracle11g
   - run-db-unit-tests-oracle12c
   - run-db-unit-tests-postgresql93
-  - run-db-integration-tests-mssql2014-Category1
-  - run-db-integration-tests-mssql2014-Category2
+  - run-integration-tests-Category1
+  - run-integration-tests-Category2
+  - run-integration-tests-Category3
+  - run-integration-tests-Category4
   - run-it-released-plugins
   - run-perf-tests
 
@@ -28,13 +30,13 @@ exclude:
     SLAVE_TYPE: performance
   - RUN_ACTIVITY: run-db-unit-tests-postgresql93
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category1
+  - RUN_ACTIVITY: run-integration-tests-Category1
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category2
+  - RUN_ACTIVITY: run-integration-tests-Category2
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category3
+  - RUN_ACTIVITY: run-integration-tests-Category3
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category4
+  - RUN_ACTIVITY: run-integration-tests-Category4
     SLAVE_TYPE: performance
   - RUN_ACTIVITY: run-it-released-plugins
     SLAVE_TYPE: performance

diff --git a/cix.sh b/cix.sh
index 23d5f5a0c889dea7e716f9cfe21c2bc2ce188ef4..2a2993e308c418beec0341f1d5ccd431c83939d8 100755 (executable)
--- a/cix.sh
+++ b/cix.sh
@@ -18,6 +18,12 @@ case "$RUN_ACTIVITY" in
     ./run-integration-tests.sh "${CATEGORY}" "http://infra.internal.sonarsource.com/jenkins/orch-${DB_ENGINE}.properties"
     ;;
 
+  run-integration-tests-*)
+      CATEGORY=`echo $RUN_ACTIVITY | sed "s/run-integration-tests-//g"`
+
+      ./run-integration-tests.sh "${CATEGORY}" "http://infra.internal.sonarsource.com/jenkins/orch-embedded.properties"
+      ;;
+
   run-it-released-plugins)
     ./run-integration-tests.sh "Plugins" "http://infra.internal.sonarsource.com/jenkins/orch-h2.properties"
     ;;