From 88648fc9fbdb2eba6982b754b46e9edd3f32579b Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Wed, 20 Sep 2017 02:18:20 +0000 Subject: Add sonar and push to pypi Issue-Id: DCAEGEN2-60 Change-Id: I4d2d32ca2c5ffb113c4379a1b3374b1a1dfc1856 Signed-off-by: Lusheng Ji --- check-blueprint-vs-input/pom.xml | 4 +- mvn-phase-lib.sh | 386 +++++++++++++++++++++++++++++++++++++++ mvn-phase-script.sh | 131 ++++++++----- pom.xml | 59 +++++- python-cbs-docker-client/pom.xml | 6 +- python-cbs-docker-client/tox.ini | 11 ++ python-dcae-policy/pom.xml | 5 +- python-dcae-policy/tox.ini | 11 ++ python-discovery-client/pom.xml | 5 +- python-discovery-client/tox.ini | 11 ++ python-dockering/pom.xml | 5 +- python-dockering/tox.ini | 11 ++ repackage/pom.xml | 4 +- 13 files changed, 585 insertions(+), 64 deletions(-) create mode 100755 mvn-phase-lib.sh create mode 100644 python-cbs-docker-client/tox.ini create mode 100644 python-dcae-policy/tox.ini create mode 100644 python-discovery-client/tox.ini create mode 100644 python-dockering/tox.ini diff --git a/check-blueprint-vs-input/pom.xml b/check-blueprint-vs-input/pom.xml index 9af1db6..d3a9e5a 100644 --- a/check-blueprint-vs-input/pom.xml +++ b/check-blueprint-vs-input/pom.xml @@ -21,13 +21,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils check-blueprint-vs-input - check-blueprint-vs-input + dcaegen2-utils-check-blueprint-vs-input 1.0.0-SNAPSHOT http://maven.apache.org diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh new file mode 100755 index 0000000..92e5786 --- /dev/null +++ b/mvn-phase-lib.sh @@ -0,0 +1,386 @@ +#!/bin/bash + +# ================================================================================ +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. + + +#MVN_PROJECT_MODULEID="$1" +#MVN_PHASE="$2" +#PROJECT_ROOT=$(dirname $0) + +FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}" +if [ "$MVN_PROJECT_MODULEID" == "__" ]; then + MVN_PROJECT_MODULEID="" +fi + +if [[ "$MVN_PROJECT_VERSION" == *SNAPSHOT ]]; then + echo "=> for SNAPSHOT artifact build" + MVN_DEPLOYMENT_TYPE='SNAPSHOT' +else + echo "=> for STAGING/RELEASE artifact build" + MVN_DEPLOYMENT_TYPE='STAGING' +fi +echo "MVN_DEPLOYMENT_TYPE is [$MVN_DEPLOYMENT_TYPE]" + + +TIMESTAMP=$(date +%C%y%m%dT%H%M%S) + +# expected environment variables +if [ -z "${MVN_NEXUSPROXY}" ]; then + echo "MVN_NEXUSPROXY environment variable not set. Cannot proceed" + exit +fi +MVN_NEXUSPROXY_HOST=$(echo "$MVN_NEXUSPROXY" |cut -f3 -d'/' | cut -f1 -d':') +echo "=> Nexus Proxy at $MVN_NEXUSPROXY_HOST, $MVN_NEXUSPROXY" + +if [ -z "$WORKSPACE" ]; then + WORKSPACE=$(pwd) +fi + +if [ -z "$SETTINGS_FILE" ]; then + echo "SETTINGS_FILE environment variable not set. Cannot proceed" + exit +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]" +echo "MVN_NEXUSPROXY is [$MVN_NEXUSPROXY]" +echo "MVN_RAWREPO_BASEURL_UPLOAD is [$MVN_RAWREPO_BASEURL_UPLOAD]" +echo "MVN_RAWREPO_BASEURL_DOWNLOAD is [$MVN_RAWREPO_BASEURL_DOWNLOAD]" +MVN_RAWREPO_HOST=$(echo "$MVN_RAWREPO_BASEURL_UPLOAD" | cut -f3 -d'/' |cut -f1 -d':') +echo "MVN_RAWREPO_HOST is [$MVN_RAWREPO_HOST]" +echo "MVN_RAWREPO_SERVERID is [$MVN_RAWREPO_SERVERID]" +echo "MVN_DOCKERREGISTRY_DAILY is [$MVN_DOCKERREGISTRY_DAILY]" +echo "MVN_DOCKERREGISTRY_RELEASE is [$MVN_DOCKERREGISTRY_RELEASE]" + +echo "MVN_PYPISERVER_SERVERID [$MVN_PYPISERVER_SERVERID]" +echo "MVN_PYPISERVER_BASEURL is [$MVN_PYPISERVER_BASEURL]" + + + +clean_templated_files() +{ + TEMPLATE_FILES=$(find . -name "*-template") + for F in $TEMPLATE_FILES; do + F2=$(echo "$F" | sed 's/-template$//') + rm -f "$F2" + done +} +clean_tox_files() +{ + TOX_FILES=$(find . -name ".tox") + TOX_FILES="$TOX_FILES $(find . -name 'venv-tox')" + for F in $TOX_FILES; do + rm -rf "$F" + done +} + +expand_templates() +{ + # set up env variables, get ready for template resolution + # NOTE: CCSDK artifacts do not distinguish REALESE vs SNAPSHOTs + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.plugins" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.plugins" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" + export ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.ccsdk.platform.blueprints" + + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/snapshots" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/releases" + export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/snapshots" + + export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="${MVN_NEXUSPROXY}/content/sites/pypi" + + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="$MVN_DOCKERREGISTRY_DAILY" + export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="$MVN_DOCKERREGISTRY_DAILY/snapshots" + + + TEMPLATE_FILES=$(find . -name "*-template") + for F in $TEMPLATE_FILES; do + F2=$(echo "$F" | sed 's/-template$//') + cp "$F" "$F2" + MOD=$(stat --format '%a' "$F") + chmod "$MOD" "$F2" + done + + + TEMPLATES=$(env |grep ONAPTEMPLATE) + if [ -z "$TEMPLATES" ]; then + return 0 + fi + + echo "====> Resolving the following temaplate from environment variables " + echo "[$TEMPLATES]" + SELFFILE=$(echo "$0" | rev | cut -f1 -d '/' | rev) + for TEMPLATE in $TEMPLATES; do + KEY=$(echo "$TEMPLATE" | cut -f1 -d'=') + VALUE=$(echo "$TEMPLATE" | cut -f2 -d'=') + VALUE2=$(echo "$TEMPLATE" | cut -f2 -d'=' |sed 's/\//\\\//g') + set +e + FILES=$(grep -rl "$KEY") + set -e + + if [ -z "$FILES" ]; then + continue + fi + + # assuming FILES is not longer than 2M bytes, the limit for variable value max size on this VM + for F in $FILES; do + if [[ $F == *"$SELFFILE" ]]; then + continue + fi + if [[ "$F" == *-template ]]; then + continue + fi + + echo "======> Resolving template $KEY to value $VALUE for file $F" + sed -i "s/{{[[:space:]]*$KEY[[:space:]]*}}/$VALUE2/g" "$F" + #cat "$F" + done + + #if [ ! -z "$FILES" ]; then + # echo "====> Resolving template $VALUE to value $VALUE" + # #CMD="grep -rl \"$VALUE\" | tr '\n' '\0' | xargs -0 sed -i \"s/{{[[:space:]]*$VALUE[[:space:]]*}}/$VALUE/g\"" + # grep -rl "$KEY" | tr '\n' '\0' | xargs -0 sed -i 's/$KEY/$VALUE2/g' + # #echo $CMD + # #eval $CMD + #fi + done + echo "====> Done template reolving" +} + + +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 +} + +build_wagons() +{ + rm -rf ./*.wgn venv-pkg + + SETUPFILES=$(find . -name "setup.py") + for SETUPFILE in $SETUPFILES; do + PLUGIN_DIR=$(echo "$SETUPFILE" |rev | cut -f 2- -d '/' |rev) + PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g') + PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g') + + echo "In $PLUGIN_DIR, $PLUGIN_NAME, $PLUGIN_VERSION" + + virtualenv ./venv-pkg + source ./venv-pkg/bin/activate + pip install --upgrade pip + pip install wagon + wagon create --format tar.gz "$PLUGIN_DIR" + deactivate + rm -rf venv-pkg + + PKG_FILE_NAMES=( "${PLUGIN_NAME}-${PLUGIN_VERSION}"*.wgn ) + echo Built package: "${PKG_FILE_NAMES[@]}" + done +} + + +upload_raw_file() +{ + # Extract the username and password to the nexus repo from the settings file + USER=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/password/text()" "$SETTINGS_FILE") + NETRC=$(mktemp) + echo "machine $MVN_RAWREPO_HOST login $USER password $PASS" > "$NETRC" + + REPO="$MVN_RAWREPO_BASEURL_UPLOAD" + + OUTPUT_FILE=$1 + EXT=$(echo "$OUTPUT_FILE" | rev |cut -f1 -d '.' |rev) + if [ "$EXT" == 'yaml' ]; then + OUTPUT_FILE_TYPE='text/x-yaml' + elif [ "$EXT" == 'sh' ]; then + OUTPUT_FILE_TYPE='text/x-shellscript' + elif [ "$EXT" == 'gz' ]; then + OUTPUT_FILE_TYPE='application/gzip' + elif [ "$EXT" == 'wgn' ]; then + OUTPUT_FILE_TYPE='application/gzip' + else + OUTPUT_FILE_TYPE='application/octet-stream' + fi + + + if [ "$MVN_DEPLOYMENT_TYPE" == 'SNAPSHOT' ]; then + SEND_TO="${REPO}/${FQDN}/snapshots" + elif [ "$MVN_DEPLOYMENT_TYPE" == 'STAGING' ]; then + SEND_TO="${REPO}/${FQDN}/releases" + else + echo "Unreconfnized deployment type, quit" + exit + fi + if [ ! -z "$MVN_PROJECT_MODULEID" ]; then + SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID" + fi + + echo "Sending ${OUTPUT_FILE} to Nexus: ${SEND_TO}" + curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}-${MVN_PROJECT_VERSION}-${TIMESTAMP}" + curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}-${MVN_PROJECT_VERSION}" + curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}" +} + + + +upload_wagons_and_type_yamls() +{ + WAGONS=$(ls -1 ./*.wgn) + for WAGON in $WAGONS ; do + WAGON_NAME=$(echo "$WAGON" | cut -f1 -d '-') + WAGON_VERSION=$(echo "$WAGON" | cut -f2 -d '-') + WAGON_TYPEFILE=$(grep -rl "$WAGON_NAME" | grep yaml | head -1) + + upload_raw_file "$WAGON" + upload_raw_file "$WAGON_TYPEFILE" + done +} + +upload_files_of_extension() +{ + FILES=$(ls -1 ./*."$1") + for F in $FILES ; do + upload_raw_file "$F" + done +} + + +generate_pypirc_then_publish() +{ + set +x + USER=$(xpath -e "//servers/server[id='$MVN_PYPISERVER_SERVERID']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -e "//servers/server[id='$MVN_PYPISERVER_SERVERID']/password/text()" "$SETTINGS_FILE") + + if [[ "$MVN_PYPISERVER_BASEURL" != */ ]]; then + MVN_PYPISERVER_BASEURL="${MVN_PYPISERVER_BASEURL}/" + fi + + + cat > ~/.pypirc < Prepare environment " -env +MVN_PROJECT_MODULEID="$1" +MVN_PHASE="$2" +PROJECT_ROOT=$(dirname $0) + +# expected environment variables +if [ -z "${MVN_NEXUSPROXY}" ]; then + echo "MVN_NEXUSPROXY environment variable not set. Cannot proceed" + exit 1 +fi +if [ -z "$SETTINGS_FILE" ]; then + echo "SETTINGS_FILE environment variable not set. Cannot proceed" + exit 2 +fi + + +source "${PROJECT_ROOT}"/mvn-phase-lib.sh + # This is the base for where "deploy" will upload # MVN_NEXUSPROXY is set in the pom.xml @@ -31,73 +49,96 @@ REPO=$MVN_NEXUSPROXY/content/sites/raw/$MVN_PROJECT_GROUPID TIMESTAMP=$(date +%C%y%m%dT%H%M%S) export BUILD_NUMBER="${TIMESTAMP}" -# expected environment variables -if [ -z "${MVN_NEXUSPROXY}" ]; then - echo "MVN_NEXUSPROXY environment variable not set. Cannot proceed" - exit -fi -MVN_NEXUSPROXY_HOST=$(echo "$MVN_NEXUSPROXY" |cut -f3 -d'/' | cut -f1 -d':') -echo "=> Nexus Proxy at $MVN_NEXUSPROXY_HOST, $MVN_NEXUSPROXY" -# use the version text detect which phase we are in in LF CICD process: verify, merge, or (daily) release - -# mvn phase in life cycle -MVN_PHASE="$2" shift 2 case $MVN_PHASE in clean) echo "==> clean phase script" - if [ -f makefile -o -f Makefile ];then make clean; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make clean; else :; fi + ;; + *) + clean_templated_files + clean_tox_files + rm -rf ./venv-* ./*.wgn ./site ./coverage.xml ./xunit-results.xml + ;; + esac ;; generate-sources) echo "==> generate-sources phase script" - if [ -f makefile -o -f Makefile ];then make generate-sources; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make generate-sources; else :; fi + ;; + *) + expand_templates + ;; + esac ;; compile) echo "==> compile phase script" - if [ -f makefile -o -f Makefile ];then make compile; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make compile; else :; fi + ;; + *) + ;; + esac ;; test) echo "==> test phase script" - if [ -f makefile -o -f Makefile ];then make test; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make test; else :; fi + ;; + *) + set +e + run_tox_test + set -e + ;; + esac ;; package) echo "==> package phase script" - if [ -f makefile -o -f Makefile ];then make package; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make package; else :; fi + ;; + *) + ;; + esac ;; install) echo "==> install phase script" - if [ -f makefile -o -f Makefile ];then make install; else :; fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make install; else :; fi + ;; + *) + ;; + esac ;; deploy) echo "==> deploy phase script" - if [ -f makefile -o -f Makefile ];then make deploy - else - # Upload all files (listed as additional deployment arguments) to Nexus - set -e -x - function setnetrc { - # Turn off -x so won't leak the credentials - set +x - hostport=$(echo $1 | cut -f3 -d /) - host=$(echo $hostport | cut -f1 -d:) - settings=${SETTINGS_FILE:-$HOME/.m2/settings.xml} - echo machine $host login $(xpath -q -e "//servers/server[id='$MVN_SERVER_ID']/username/text()" $settings) password $(xpath -q -e "//servers/server[id='$MVN_SERVER_ID']/password/text()" $settings) >$HOME/.netrc - chmod 600 $HOME/.netrc - set -x - } - function putraw { - curl -X PUT -H "Content-Type: $3" --netrc --upload-file $1 --url $REPO/$2 - } - setnetrc $REPO - - # additional - for artifact - do - putraw $artifact artifacts/$artifact application/data - done - set +e +x - fi + case $MVN_PROJECT_MODULEID in + check-blueprint-vs-input | repackage) + if [ -f makefile -o -f Makefile ];then make deploy + else + # Upload all files (listed as additional deployment arguments) to Nexus + # additional + for artifact + do + upload_raw_file $artifact + done + set +e +x + fi + ;; + *) + generate_pypirc_then_publish + ;; + esac ;; *) echo "==> unprocessed phase" diff --git a/pom.xml b/pom.xml index 2c6e57a..1edd6d4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.oparent - oparent + org.onap.dcaegen2 + root 1.0.0-SNAPSHOT - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils dcaegen2-utils 1.0.0-SNAPSHOT @@ -41,4 +41,57 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. repackage + + UTF-8 + true + */ + **/xunit-results.xml + **/coverage.xml + + http://localhost:9000 + tests/* + + + py + Python + **/*.py + + + + + ${project.artifactId}-${project.version} + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + ${session.executionRootDirectory}/mvn-phase-script.sh + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + ${onap.nexus.url} + ${onap.nexus.rawrepo.baseurl.upload} + ${onap.nexus.rawrepo.baseurl.download} + ${onap.nexus.rawrepo.serverid} + ${onap.nexus.dockerregistry.snapshot} + ${onap.nexus.dockerregistry.release} + ${onap.nexus.dockerregistry.snapshot.serverid} + ${onap.nexus.dockerregistry.release.serverid} + ${onap.nexus.pypiserver.baseurl} + ${onap.nexus.pypiserver.serverid} + + + + + + diff --git a/python-cbs-docker-client/pom.xml b/python-cbs-docker-client/pom.xml index f2e2ea1..ad704b4 100644 --- a/python-cbs-docker-client/pom.xml +++ b/python-cbs-docker-client/pom.xml @@ -21,19 +21,19 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils python-cbs-docker-client - python-cbs-docker-client + dcaegen2-utils-python-cbs-docker-client 1.0.0-SNAPSHOT http://maven.apache.org UTF-8 - true + . diff --git a/python-cbs-docker-client/tox.ini b/python-cbs-docker-client/tox.ini new file mode 100644 index 0000000..987b009 --- /dev/null +++ b/python-cbs-docker-client/tox.ini @@ -0,0 +1,11 @@ +# content of: tox.ini , put in same dir as setup.py +[tox] +envlist = py27,py35 + +[testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir} --cov-report=xml diff --git a/python-dcae-policy/pom.xml b/python-dcae-policy/pom.xml index e5b30c8..1d02fcd 100644 --- a/python-dcae-policy/pom.xml +++ b/python-dcae-policy/pom.xml @@ -21,19 +21,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils python-dcae-policy - python-dcae-policy + dcaegen2-utils-python-dcae-policy 1.0.0-SNAPSHOT http://maven.apache.org UTF-8 - true . diff --git a/python-dcae-policy/tox.ini b/python-dcae-policy/tox.ini new file mode 100644 index 0000000..987b009 --- /dev/null +++ b/python-dcae-policy/tox.ini @@ -0,0 +1,11 @@ +# content of: tox.ini , put in same dir as setup.py +[tox] +envlist = py27,py35 + +[testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir} --cov-report=xml diff --git a/python-discovery-client/pom.xml b/python-discovery-client/pom.xml index 0b05110..3aeb4db 100644 --- a/python-discovery-client/pom.xml +++ b/python-discovery-client/pom.xml @@ -21,19 +21,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils python-discovery-client - python-discovery-client + dcaegen2-utils-python-discovery-client 1.0.0-SNAPSHOT http://maven.apache.org UTF-8 - true . diff --git a/python-discovery-client/tox.ini b/python-discovery-client/tox.ini new file mode 100644 index 0000000..987b009 --- /dev/null +++ b/python-discovery-client/tox.ini @@ -0,0 +1,11 @@ +# content of: tox.ini , put in same dir as setup.py +[tox] +envlist = py27,py35 + +[testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir} --cov-report=xml diff --git a/python-dockering/pom.xml b/python-dockering/pom.xml index 37175e5..b71e77c 100644 --- a/python-dockering/pom.xml +++ b/python-dockering/pom.xml @@ -21,20 +21,19 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils python-dockering - python-dockering + dcaegen2-utils-python-dockering 1.0.0-SNAPSHOT http://maven.apache.org UTF-8 true - . diff --git a/python-dockering/tox.ini b/python-dockering/tox.ini new file mode 100644 index 0000000..987b009 --- /dev/null +++ b/python-dockering/tox.ini @@ -0,0 +1,11 @@ +# content of: tox.ini , put in same dir as setup.py +[tox] +envlist = py27,py35 + +[testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +commands=pytest --junitxml xunit-results.xml --cov {envsitepackagesdir} --cov-report=xml diff --git a/repackage/pom.xml b/repackage/pom.xml index 055c087..20d24a3 100644 --- a/repackage/pom.xml +++ b/repackage/pom.xml @@ -21,13 +21,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. 4.0.0 - org.onap.dcaegen2 + org.onap.dcaegen2.utils utils 1.0.0-SNAPSHOT org.onap.dcaegen2.utils repackage - repackage + dcaegen2-utils-repackage 1.0.0-SNAPSHOT http://maven.apache.org -- cgit 1.2.3-korg