Merge "Add UT case for YamlUtil"

diff --git a/gvnfmadapter/mvn-phase-script.sh b/gvnfmadapter/mvn-phase-script.sh
index 6103ce5..6b41abf 100755 (executable)
--- a/gvnfmadapter/mvn-phase-script.sh
+++ b/gvnfmadapter/mvn-phase-script.sh
@@ -43,24 +43,30 @@ echo "MVN_PROJECT_GROUPID is             [$MVN_PROJECT_GROUPID]"
 echo "MVN_PROJECT_ARTIFACTID is          [$MVN_PROJECT_ARTIFACTID]"
 echo "MVN_PROJECT_VERSION is             [$MVN_PROJECT_VERSION]"
 
-run_tox_test() 
-{ 
+run_tox_test()
+{
   set -x
   CURDIR=$(pwd)
-  TOXINIS=$(find . -name "tox.ini")
-  for TOXINI in "${TOXINIS[@]}"; do
-    DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
-    cd "${CURDIR}/${DIR}"
-    rm -rf ./venv-tox ./.tox
-    virtualenv ./venv-tox
-    source ./venv-tox/bin/activate
-    pip install --upgrade pip
-    pip install --upgrade tox argparse
-    pip freeze
-    tox
-    deactivate
-    rm -rf ./venv-tox ./.tox
-  done
+  if [[ ${CURDIR} =~ "-sonar" ]]
+  then
+    echo "====Sonar job, need execute tox."
+    TOXINIS=$(find . -name "tox.ini")
+    for TOXINI in "${TOXINIS[@]}"; do
+      DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
+      cd "${CURDIR}/${DIR}"
+      rm -rf ./venv-tox ./.tox
+      virtualenv ./venv-tox
+      source ./venv-tox/bin/activate
+      pip install --upgrade pip
+      pip install --upgrade tox argparse
+      pip freeze
+      tox
+      deactivate
+      rm -rf ./venv-tox ./.tox
+    done
+  else
+    echo "====Not a sonar job, need not execute tox."
+  fi
 }
 
 

diff --git a/gvnfmadapter/pom.xml b/gvnfmadapter/pom.xml
index 6054070..5b6e322 100644 (file)
--- a/gvnfmadapter/pom.xml
+++ b/gvnfmadapter/pom.xml
@@ -45,7 +45,7 @@
               <artifactId>exec-maven-plugin</artifactId>
               <version>1.2.1</version>
               <configuration>
-                <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+                <executable>${project.basedir}/mvn-phase-script.sh</executable>
                 <environmentVariables>
                   <!-- make mvn properties as env for our script -->
                   <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>