From: Yun Huang Date: Tue, 13 Mar 2018 08:39:58 +0000 (+0800) Subject: Fix sonar coverage issue for windriver X-Git-Tag: v1.1.2~200 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=280526abe4be41d9e66c8d7b9d70d43c6ab61d64;p=multicloud%2Fopenstack.git Fix sonar coverage issue for windriver Change-Id: I6ce2f757d7847250e515529c95694c3611c09e97 Issue-ID: MULTICLOUD-171 Signed-off-by: Yun Huang --- diff --git a/windriver/mvn-phase-script.sh b/windriver/mvn-phase-script.sh new file mode 100755 index 00000000..938be328 --- /dev/null +++ b/windriver/mvn-phase-script.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 + echo $PWD + 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 ${CURDIR} + tox + 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 + diff --git a/windriver/pom.xml b/windriver/pom.xml index df960783..57a24869 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -50,7 +50,58 @@ tests/*,setup.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/windriver/tox.ini b/windriver/tox.ini index 0f9b2aee..36284148 100644 --- a/windriver/tox.ini +++ b/windriver/tox.ini @@ -1,15 +1,35 @@ [tox] -envlist = py27,py35 +envlist = py27,py35,cov skipsdist = true [tox:jenkins] downloadcache = ~/cache/pip +[flake8] +ignore = E501,E722 +exclude = ./venv-tox,./.tox +max-complexity = 27 + [testenv] setenv = PYTHONPATH = {toxinidir}/../share deps = -r{toxinidir}/requirements.txt commands = coverage run --branch manage.py test titanium_cloud - coverage report --omit=".tox/*,*tests*,*__init__.py,*newton*" --fail-under=30 - coverage xml -i + coverage report --omit=".tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30 + +[testenv:pep8] +deps=flake8 +commands=flake8 + +[testenv:cov] +commands = coverage xml --omit="*test_*,*__init__.py,*site-packages*" + +[testenv:cover] +setenv= + DJANGO_SETTINGS_MODULE = titanium_cloud.settings-cover +commands = + coverage erase + {[testenv]commands} + coverage xml -i +