From 93e14ef514e68b0d060f359c8b33c962f61393e2 Mon Sep 17 00:00:00 2001 From: Dario Faccin Date: Thu, 20 Apr 2023 16:13:50 +0200 Subject: [PATCH] Improve stage-test script: Split charms list according to tox envlist. For newer charms the tox envlist includes lint, unit and integration: for these charms execute only lint and unit tests. For older charms the tox envlist includes black, cover, flake8, pylint, yamllint, safety: for these charms execute all tests. Change-Id: I6cfbe129440be1665f63572a1879060eccd822fd Signed-off-by: Dario Faccin --- devops-stages/stage-test.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index d37d40ff..1d0d243c 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-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 -- 2.25.1