From: fujinhua Date: Fri, 2 Mar 2018 09:23:26 +0000 (+0800) Subject: Add Sonar coverage for vfc-nfvo-catalog X-Git-Tag: v1.1.0~34 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F33773%2F1;p=vfc%2Fnfvo%2Fcatalog.git Add Sonar coverage for vfc-nfvo-catalog Change-Id: Ib55c4777613792f316977b886e0243d263a31d53 Issue-ID: VFC-782 Signed-off-by: fujinhua --- diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh new file mode 100755 index 00000000..6103ce51 --- /dev/null +++ b/mvn-phase-script.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# Copyright 2018 ZTE 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 + 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 +} + + +case $MVN_PHASE in +clean) + echo "==> clean phase script" + rm -rf ./venv-* + ;; +test) + echo "==> test phase script" + run_tox_test + ;; +*) + echo "==> unprocessed phase" + ;; +esac + diff --git a/pom.xml b/pom.xml index 9115e518..3b9f95f9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,69 @@ pom vfc-nfvo-catalog vfc nfvo catalog + + UTF-8 + . + xunit-results.xml + coverage.xml + py + python + **/**.py + **/tests/**.py,**/test*.py + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + ${session.executionRootDirectory}/mvn-phase-script.sh + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + clean phase script + clean + + exec + + + + __ + clean + + + + + test script + test + + exec + + + + __ + test + + + + + maven-assembly-plugin diff --git a/tox.ini b/tox.ini index 65fbc960..fcc6330e 100644 --- a/tox.ini +++ b/tox.ini @@ -22,4 +22,4 @@ commands = {[testenv]commands} [testenv:cov] -commands = coverage html --omit="*test*,*__init__.py,*site-packages*" -d htmlcov +commands = coverage xml --omit="*test*,*__init__.py,*site-packages*"