Improve stage-test script: Split charms list according to tox envlist.

[osm/devops.git] / devops-stages / stage-test.sh

diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
index d37d40f..1d0d243 100755 (executable)
--- a/devops-stages/stage-test.sh
+++ b/devops-stages/stage-test.sh
@@ -20,8 +20,9 @@ CURRENT_DIR=`pwd`
 
 # Execute tests for charms
 CHARM_PATH="./installers/charm"
-CHARM_NAMES="osm-lcm osm-mon osm-nbi osm-ng-ui osm-pol osm-ro keystone prometheus grafana vca-integrator-operator"
-for charm in $CHARM_NAMES; do
+NEW_CHARMS_NAMES="osm-lcm osm-mon osm-nbi osm-ng-ui osm-pol osm-ro vca-integrator-operator"
+OLD_CHARMS_NAMES="keystone prometheus grafana"
+for charm in $NEW_CHARMS_NAMES; do
     if [ $(git diff --name-only "origin/${GERRIT_BRANCH}" -- "installers/charm/${charm}" | wc -l) -ne 0 ]; then
         echo "Running tox for ${charm}"
         cd "${CHARM_PATH}/${charm}"
@@ -29,3 +30,11 @@ for charm in $CHARM_NAMES; do
         cd "${CURRENT_DIR}"
     fi
 done
+for charm in $OLD_CHARMS_NAMES; do
+    if [ $(git diff --name-only "origin/${GERRIT_BRANCH}" -- "installers/charm/${charm}" | wc -l) -ne 0 ]; then
+        echo "Running tox for ${charm}"
+        cd "${CHARM_PATH}/${charm}"
+        TOX_PARALLEL_NO_SPINNER=1 tox --parallel=auto
+        cd "${CURRENT_DIR}"
+    fi
+done