Fix Murano gate job

There were two patches which broke our gate:
1. https://review.openstack.org/#/c/80690/
   This one forces Devstack installation to fail if a project has dependencies
   not listed in the global-requirements file. Fix description:
   Devstack has two functions to install a project:
    * setup_develop
    * setup_package

   The first one does the requirements check and fails on Murano installation.
   The latter one doesn't perform any checks (it is called internally from the
   first function right after the requirements check was performed). We will
   use the latter one until all Murano requirements match global-requirements.

2. https://review.openstack.org/#/c/85032/
   This one introduced a nosetests plugin for MuranoPL. Somehow (I have no
   idea how) it breaks Tempest run in the gate. It causes our functional tests
   to behave wierdly, not recognise tempest config file and throw exception:
   "DuplicateOptError: duplicate option: use-syslog", see complete log at
   http://logs.openstack.org/13/85113/7/check/gate-murano-devstack-dsvm/4939248/console.html

   Fix description:
   Temporarily disable nosetests plugin until we figure out how to enable
   it and avoid Tempest problems in the gate.

Change-Id: I369f91fdabdc887d5ff3fb6e16d85a4d12de9f03
This commit is contained in:
Ruslan Kamaldinov 2014-04-06 23:33:25 +04:00 committed by Gerrit Code Review
parent 95a31b2394
commit 2e1785a61b
4 changed files with 11 additions and 7 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -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 =