Update cirros image to latest version

[functest.git] / run_unit_tests.sh

diff --git a/run_unit_tests.sh b/run_unit_tests.sh
index c18f3ca..8e02880 100755 (executable)
--- a/run_unit_tests.sh
+++ b/run_unit_tests.sh
@@ -2,26 +2,10 @@
 set -o errexit
 set -o pipefail
 
-function clean_results_dir {
-    if [ -d "/home/opnfv/functest/results" ]
-    then
-        sudo rm -rf /home/opnfv/functest/results
-    fi
-}
-
-# ******************************
-# prepare the env for the tests
-# ******************************
-# clean useless results dir
-# should be done at the end
-# but in case of crash during unit test
-# clean it anyway
-clean_results_dir
-
 # Either Workspace is set (CI)
 if [ -z $WORKSPACE ]
 then
-    WORKSPACE="."
+    WORKSPACE=`pwd`
 fi
 
 
@@ -40,6 +24,13 @@ pip install --upgrade pip
 pip install -r $WORKSPACE/test-requirements.txt
 pip install $WORKSPACE
 
+#install releng
+cd $WORKSPACE/../
+git clone https://gerrit.opnfv.org/gerrit/releng
+pip install releng/modules/
+rm -fr releng
+cd $WORKSPACE
+
 export CONFIG_FUNCTEST_YAML=$(pwd)/functest/ci/config_functest.yaml
 # unit tests
 # TODO: remove cover-erase
@@ -51,18 +42,15 @@ nosetests --with-xunit \
          --cover-package=functest.cli \
          --cover-package=functest.core.testcase_base \
          --cover-package=functest.opnfv_tests.sdn.odl.odl \
+         --cover-package=functest.opnfv_tests.vnf.ims \
          --cover-package=functest.utils \
+         --cover-package=functest.opnfv_tests.openstack.rally \
          --cover-xml \
          --cover-html \
+         --log-config=$(pwd)/functest/tests/unit/test_logging.ini \
          functest/tests/unit
 rc=$?
 
 deactivate
 
-# *******
-# clean
-# *******
-# Clean useless logs
-clean_results_dir
-
 exit $rc