]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Set dsvm-functional job to use system packages
authorMaru Newby <marun@redhat.com>
Wed, 17 Sep 2014 19:48:41 +0000 (19:48 +0000)
committerMaru Newby <marun@redhat.com>
Wed, 17 Sep 2014 19:57:41 +0000 (19:57 +0000)
The functional job was breaking due to the interaction between
devstack installing neutron system-wide in editable mode (pip install
-e) and tox packaging in the same path.  Installing in editable
mode meant that neutron.egg-info/PKG_INFO could be updated (in this
case by tox) to change the installed version of the neutron package
without updating scripts that depended on the installed version
(e.g. rootwrap).  This fix is to set the dsvm-functional env to
use system packages and avoid having tox update PKG_INFO.

Change-Id: Icc38cacd69bc5843ccfcc60237a7102df6d8597f
Closes-bug: #1370347

tox.ini

diff --git a/tox.ini b/tox.ini
index d8c6bbe15beb813b4cb2eda04e5fc1bf78069a3b..90cc8d766cf687918bf09ac2000bb1106d56404d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -31,6 +31,7 @@ setenv = OS_TEST_PATH=./neutron/tests/functional
          OS_SUDO_TESTING=1
          OS_ROOTWRAP_CMD=sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
          OS_FAIL_ON_MISSING_DEPS=1
+sitepackages=True
 commands =
   python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'