X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=devops-stages%2Fstage-test.sh;h=1e2f913c3bb084758c82ae0900bf896bb46e3f56;hb=d5b463cc04638b134d982c386596c82258c509fb;hp=ae36ccfdc61b01dca5ba7af32a502fd55344faf3;hpb=f776ffa5a6a673a62c51559d690cc86799c3269a;p=osm%2Fdevops.git

diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh
index ae36ccfd..1e2f913c 100755
--- 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-keystone osm-lcm osm-mon osm-nbi osm-ng-ui osm-pol osm-ro vca-integrator-operator"
+OLD_CHARMS_NAMES="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,18 @@ 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
+
+# Execute linting test for OSM helm chart
+helm lint installers/helm/osm
+
+# Execute datree test for OSM helm chart
+# helm datree test installers/helm/osm --verbose
+