Move plugins ITs to QA and enable perf tests

.cix.yml

@@ -10,6 +10,8 @@ RUN_ACTIVITY:
   - run-db-unit-tests-oracle11g
   - run-db-unit-tests-oracle12c
   - run-db-unit-tests-postgresql93
+  - run-it-released-plugins
+  - run-perf-tests
 
 exclude:
   - RUN_ACTIVITY: run-db-unit-tests-mysql56
@@ -24,5 +26,7 @@ exclude:
     SLAVE_TYPE: performance
   - RUN_ACTIVITY: run-db-unit-tests-postgresql93
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-perf-tests
+  - RUN_ACTIVITY: run-it-released-plugins
+    SLAVE_TYPE: performance
+  - RUN_ACTIVITY: run-it-released-plugins
     SLAVE_TYPE: gva

.travis.yml

@@ -11,7 +11,6 @@ env:
   - TARGET=IT IT_CATEGORY=Category3
   - TARGET=IT IT_CATEGORY=Category4
   - TARGET=IT IT_CATEGORY=Category5
-  - TARGET=IT IT_CATEGORY=Plugins
   - TARGET=WEB
 
 

cix.sh

@@ -11,17 +11,8 @@ case "$RUN_ACTIVITY" in
     ./run-db-unit-tests.sh "http://infra.internal.sonarsource.com/jenkins/orch-${DB_ENGINE}.properties"
     ;;
 
-  run-db-integration-tests-*)
-    DB_ENGINE=`echo $RUN_ACTIVITY | sed "s/run-db-integration-tests-//g" | cut -d \- -f 1`
-    CATEGORY=`echo $RUN_ACTIVITY | sed "s/run-db-integration-tests-//g" | cut -d \- -f 2`
-
-    echo "./run-db-integration-tests.sh $DB_ENGINE $CATEGORY $SLAVE_TYPE"
-    ;;
-
-  run-upgrade-tests-*)
-    DB_ENGINE=`echo $RUN_ACTIVITY | sed "s/run-upgrade-tests-//g"`
-
-    echo "./run-upgrade-tests.sh $DB_ENGINE  $SLAVE_TYPE"
+  run-it-released-plugins)
+    ./run-integration-tests.sh "http://infra.internal.sonarsource.com/jenkins/orch-h2.properties" "Plugins"
     ;;
 
   run-perf-tests)

run-db-integration-tests.sh

@@ -2,11 +2,12 @@
 set -euo pipefail
 
 ORCHESTRATOR_CONFIG_URL=$1
-shift
+CATEGORY=$2
+shift 2
 
 cd it
 mvn verify \
   -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \
   -Dwith-db-drivers \
-  -Dcategory=Category1 \
+  -Dcategory=$CATEGORY \
   -Dsource.skip=true -B -e -V $*

run-integration-tests.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -euo pipefail
+
+ORCHESTRATOR_CONFIG_URL=$1
+CATEGORY=$2
+shift 2
+
+cd it
+mvn verify \
+  -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \
+  -Dcategory=$CATEGORY \
+  -Dsource.skip=true -B -e -V $*

travis.sh

@@ -65,12 +65,8 @@ WEB)
   ;;
 
 IT)
-  if [ "$IT_CATEGORY" == "Plugins" ] && [ ! -n "${GITHUB_TOKEN:-}" ]; then
-    echo "This job is ignored as it needs to access a private GitHub repository"
-  else
-    start_xvfb
-    mvn install -Pit,dev -DskipTests -Dcategory=$IT_CATEGORY -Dmaven.test.redirectTestOutputToFile=false -B -V -e -Dsource.skip=true
-  fi
+  start_xvfb
+  mvn install -Pit,dev -DskipTests -Dcategory=$IT_CATEGORY -Dmaven.test.redirectTestOutputToFile=false -B -V -e -Dsource.skip=true
   ;;
 
 *)