diff --git a/contrib/devstack/lib/murano b/contrib/devstack/lib/murano index 1546ed03..89adefa6 100644 --- a/contrib/devstack/lib/murano +++ b/contrib/devstack/lib/murano @@ -140,7 +140,11 @@ function init_murano() { # install_murano() - Collect source and prepare function install_murano() { git_clone $MURANO_REPO $MURANO_DIR $MURANO_BRANCH - setup_develop $MURANO_DIR + + # TODO(ruhe): use setup_develop once Murano requirements match with global-requirement.txt + # both functions (setup_develop and setup_package) are defined at: + # http://git.openstack.org/cgit/openstack-dev/devstack/tree/functions-common + setup_package $MURANO_DIR -e } diff --git a/functionaltests/post_test_hook.sh b/functionaltests/post_test_hook.sh index b1a0c28e..09107fa2 100755 --- a/functionaltests/post_test_hook.sh +++ b/functionaltests/post_test_hook.sh @@ -14,8 +14,11 @@ # This script is executed inside post_test_hook function in devstack gate. -# Install packages from test-requirements.txt -sudo pip install -r /opt/stack/new/murano-api/test-requirements.txt - cd /opt/stack/new/murano-api/functionaltests sudo ./run_tests.sh +RETVAL=$? + +# Copy tempest log files to be published among other logs upon job completion +sudo cp /opt/stack/new/murano-api/functionaltests/tempest.log /opt/stack/logs + +exit $RETVAL \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 8549878d..9fcc8a81 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,8 +45,6 @@ console_scripts = murano-api = muranoapi.cmd.api:main murano-engine = muranoapi.cmd.engine:main murano-manage = muranoapi.cmd.manage:main -nose.plugins.0.10 = - munit = muranoapi.tests.nose_plugins.munit:MuranoPLUnitTestPlugin [build_sphinx] all_files = 1 diff --git a/tox.ini b/tox.ini index 3756b6da..2cc518b2 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = nosetests -w muranoapi/tests - nosetests --with-munit -w muranoapi/tests/language --metadata-dir=./meta [testenv:pep8] commands =