aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-02-19 09:41:22 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-02-22 20:56:59 +0100
commit58f770105ceef3a41a698ccd83c57d4498e6741d (patch)
tree67b1609479751f90984015c4f0205f84c012e128
parent6e9accbad15f8485f8860a8afbb525c4a04dd278 (diff)
downloadsonarqube-58f770105ceef3a41a698ccd83c57d4498e6741d.tar.gz
sonarqube-58f770105ceef3a41a698ccd83c57d4498e6741d.zip
Complete matrix of QA tests
-rw-r--r--.cix.yml14
-rwxr-xr-xcix.sh6
2 files changed, 14 insertions, 6 deletions
diff --git a/.cix.yml b/.cix.yml
index df4b2a27a69..2166a45a59d 100644
--- 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 23d5f5a0c88..2a2993e308c 100755
--- 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"
;;