From 373f0f3559049ea91a3fb47a445c554512c36435 Mon Sep 17 00:00:00 2001
From: Andrew Gauld <ag1282@att.com>
Date: Wed, 21 Feb 2018 11:14:46 -0500
Subject: Make SONAR code coverage analysis work

Change-Id: I8091aea6127b78de404c986be74ecf44935ab92f
Issue-ID: DCAEGEN2-355
Signed-off-by: Andrew Gauld <ag1282@att.com>
---
 scripts/mvn-phase-lib.sh | 7 ++-----
 scripts/pom.xml          | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mvn-phase-lib.sh b/scripts/mvn-phase-lib.sh
index 6cef83e..ac755e0 100644
--- a/scripts/mvn-phase-lib.sh
+++ b/scripts/mvn-phase-lib.sh
@@ -52,10 +52,7 @@ if [ -z "$WORKSPACE" ]; then
     WORKSPACE=$(pwd)
 fi
 
-if [ -z "$SETTINGS_FILE" ]; then
-    echo "SETTINGS_FILE environment variable not set.  Cannot proceed"
-    exit
-fi
+export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml}
 
 
 
@@ -214,7 +211,7 @@ test_templates()
 
 run_tox_test() 
 { 
-  set -x
+  set -e -x
   CURDIR=$(pwd)
   TOXINIS=$(find . -name "tox.ini")
   for TOXINI in "${TOXINIS[@]}"; do
diff --git a/scripts/pom.xml b/scripts/pom.xml
index 12e71fb..4ff29df 100644
--- a/scripts/pom.xml
+++ b/scripts/pom.xml
@@ -45,7 +45,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <sonar.language>py</sonar.language>
     <sonar.pluginName>Python</sonar.pluginName>
     <sonar.inclusions>**/*.py</sonar.inclusions>
-    <sonar.exclusions>tests/*</sonar.exclusions>
+    <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
     <sonar.host.url>http://135.205.228.63:9000</sonar.host.url>
   </properties>
   <build>
-- 
cgit 1.2.3-korg