From: dengyh <dengyuanhong@chinamobile.com>
Date: Thu, 7 Apr 2022 07:11:57 +0000 (+0800)
Subject: Fix tox test loop in mvn-phase-script.sh
X-Git-Tag: 1.4.6~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=723f796c013bb85e5024a413ccda82341ed980f6;hp=a61ff26e3cdef211595eb88f691e6b46e48f1254;p=vfc%2Fnfvo%2Flcm.git

Fix tox test loop in mvn-phase-script.sh

Refer to: https://gerrit.onap.org/r/c/modeling/etsicatalog/+/128327

Change-Id: I7a62cd53e790d41d90d168fda3cfe9a2c1f285c8
Issue-ID: VFC-1951
Signed-off-by: dengyh <dengyuanhong@chinamobile.com>
---

diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 13b755e8..ab8155e0 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -50,9 +50,9 @@ run_tox_test()
   if [[ ${CURDIR} =~ "-sonar" ]]
   then
     echo "====Sonar job, need execute tox."
-    TOXINIS=$(find . -name "tox.ini")
+    TOXINIS=($(find . -name "tox.ini"))
     for TOXINI in "${TOXINIS[@]}"; do
-      DIR=$(echo "$TOXINI" | rev | cut -f3- -d'/' | rev)
+      DIR=$(dirname "$TOXINI")
       cd "${CURDIR}/${DIR}"
       rm -rf ./venv-tox ./.tox
       virtualenv ./venv-tox