diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-07-04 07:29:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-04 07:29:05 +0000 |
| commit | 1da5990f3e25c375757349b30b4f47d288775682 (patch) | |
| tree | 220bc03584cdaa36cd5de6eb4af464f0690cbc89 /reporting | |
| parent | 97f1a2cd7f27fdcb23b773ca4d7eabdc692235d1 (diff) | |
| parent | c6750e539026339c428914795e35d94a60af27d6 (diff) | |
Merge "Add jenkins jobs for automatic reporting dashboard deployment"
Diffstat (limited to 'reporting')
| -rw-r--r-- | reporting/docker/requirements.pip | 1 | ||||
| -rwxr-xr-x | reporting/run_test.sh | 44 | ||||
| -rwxr-xr-x | reporting/run_unit_tests.sh | 43 |
3 files changed, 45 insertions, 43 deletions
diff --git a/reporting/docker/requirements.pip b/reporting/docker/requirements.pip index 6de856e..aeee3ba 100644 --- a/reporting/docker/requirements.pip +++ b/reporting/docker/requirements.pip @@ -12,3 +12,4 @@ PyYAML==3.11 simplejson==3.8.1 jinja2==2.8 tornado==4.4.2 +requests==2.12.5 diff --git a/reporting/run_test.sh b/reporting/run_test.sh new file mode 100755 index 0000000..8c674ce --- /dev/null +++ b/reporting/run_test.sh @@ -0,0 +1,44 @@ +#!/bin/bash +set -o errexit +set -o pipefail + + +# Get script directory +SCRIPTDIR=`dirname $0` + +# Creating virtual environment +if [ ! -z $VIRTUAL_ENV ]; then + venv=$VIRTUAL_ENV +else + venv=$SCRIPTDIR/.venv + virtualenv $venv +fi + +source $venv/bin/activate + +export CONFIG_REPORTING_YAML=$SCRIPTDIR/reporting.yaml + +# *************** +# Run unit tests +# *************** +echo "Running unit tests..." + +# install python packages +easy_install -U setuptools +easy_install -U pip +pip install -r $SCRIPTDIR/docker/requirements.pip +pip install -e $SCRIPTDIR + +python $SCRIPTDIR/setup.py develop + +# unit tests +# TODO: remove cover-erase +# To be deleted when all functest packages will be listed +nosetests --with-xunit \ + --cover-package=$SCRIPTDIR/utils \ + --with-coverage \ + --cover-xml \ + $SCRIPTDIR/tests/unit +rc=$? + +deactivate diff --git a/reporting/run_unit_tests.sh b/reporting/run_unit_tests.sh deleted file mode 100755 index 6b0e3b2..0000000 --- a/reporting/run_unit_tests.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -set -o errexit -set -o pipefail - -# ****************************** -# prepare the env for the tests -# ****************************** -# Either Workspace is set (CI) -if [ -z $WORKSPACE ] -then - WORKSPACE="." -fi - -export CONFIG_REPORTING_YAML=./reporting.yaml - -# *************** -# Run unit tests -# *************** -echo "Running unit tests..." - -# start vitual env -virtualenv $WORKSPACE/reporting_venv -source $WORKSPACE/reporting_venv/bin/activate - -# install python packages -easy_install -U setuptools -easy_install -U pip -pip install -r $WORKSPACE/docker/requirements.pip -pip install -e $WORKSPACE - -python $WORKSPACE/setup.py develop - -# unit tests -# TODO: remove cover-erase -# To be deleted when all functest packages will be listed -nosetests --with-xunit \ - --cover-package=utils \ - --with-coverage \ - --cover-xml \ - tests/unit -rc=$? - -deactivate |