summaryrefslogtreecommitdiffstats
path: root/vio
diff options
context:
space:
mode:
authorEthan Lynn <ethanlynnl@vmware.com>2019-07-24 21:37:20 +0800
committerEthan Lynn <ethanlynnl@vmware.com>2019-07-24 21:56:56 +0800
commit02f3b1e0e4074e13173d62e6f684a790baf65623 (patch)
tree15d671a962eeed903632ca4289ed72774edce04c /vio
parentd39c92b143c29c5f5d2a51940bb99785031b7364 (diff)
Fix dockerfile
fix dockerfile add sonar.sh Change-Id: Idca30baa32fd3a79459f5b09f71ff9b01e7f8a47 Issue-ID: MULTICLOUD-706 Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
Diffstat (limited to 'vio')
-rw-r--r--vio/docker/Dockerfile2
-rw-r--r--vio/pom.xml2
-rwxr-xr-xvio/sonar.sh83
3 files changed, 85 insertions, 2 deletions
diff --git a/vio/docker/Dockerfile b/vio/docker/Dockerfile
index ba15ddb..8253270 100644
--- a/vio/docker/Dockerfile
+++ b/vio/docker/Dockerfile
@@ -24,7 +24,7 @@ RUN apk update && \
mkdir -p /var/log/onap/multicloud/vio && \
chmod a+rw /var/log/onap/multicloud/vio && \
chown onap:onap -R /opt/vio/ && \
- apk del -y unzip gcc make libc-dev libffi-dev openssl-dev
+ apk del unzip gcc make libc-dev libffi-dev openssl-dev
USER onap
diff --git a/vio/pom.xml b/vio/pom.xml
index 210875f..260bdab 100644
--- a/vio/pom.xml
+++ b/vio/pom.xml
@@ -35,7 +35,7 @@
<sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
<sonar.sources>.</sonar.sources>
<sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
- <sonar.python.coverage.reportPath>vio/coverage.xml</sonar.python.coverage.reportPath>
+ <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
<sonar.language>py</sonar.language>
<sonar.pluginName>Python</sonar.pluginName>
<sonar.inclusions>**/*.py</sonar.inclusions>
diff --git a/vio/sonar.sh b/vio/sonar.sh
new file mode 100755
index 0000000..91f09f0
--- /dev/null
+++ b/vio/sonar.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# Copyright 2018 VMware Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+set -e
+
+echo "running script: [$0] for module [$1] at stage [$2]"
+
+export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml}
+MVN_PROJECT_MODULEID="$1"
+MVN_PHASE="$2"
+
+
+FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}"
+if [ "$MVN_PROJECT_MODULEID" == "__" ]; then
+ MVN_PROJECT_MODULEID=""
+fi
+
+if [ -z "$WORKSPACE" ]; then
+ WORKSPACE=$(pwd)
+fi
+
+# mvn phase in life cycle
+MVN_PHASE="$2"
+
+
+echo "MVN_PROJECT_MODULEID is [$MVN_PROJECT_MODULEID]"
+echo "MVN_PHASE is [$MVN_PHASE]"
+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()
+{
+ set -x
+ cd vio
+ CURDIR=$(pwd)
+ TOXINIS=$(find . -name "tox.ini")
+ cd ..
+ 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
+ cd vio
+ tox -e cover
+ deactivate
+ cd ..
+ rm -rf ./venv-tox ./.tox
+ done
+}
+
+
+case $MVN_PHASE in
+clean)
+ echo "==> clean phase script"
+ rm -rf ./venv-*
+ ;;
+test)
+ echo "==> test phase script"
+ run_tox_test
+ ;;
+*)
+ echo "==> unprocessed phase"
+ ;;
+esac
+