Merge "Install nose 1.1 from EPEL for RHEL."

This commit is contained in:
Jenkins 2013-05-28 20:47:37 +00:00 committed by Gerrit Code Review
commit 6676e5ec85
3 changed files with 11 additions and 4 deletions

@ -16,8 +16,7 @@ python-kombu
python-migrate
python-mox
python-netaddr
# RHEL6's python-nose is incompatible with Tempest
python-nose #dist:f16,f17,f18
python-nose
python-paste #dist:f16,f17,f18
python-paste-deploy #dist:f16,f17,f18
python-pep8

@ -7,8 +7,7 @@ python-devel
python-eventlet
python-greenlet
python-netifaces
# RHEL6's python-nose is incompatible with Tempest
python-nose # dist:f16,f17,f18
python-nose
python-paste-deploy # dist:f16,f17,f18
python-setuptools # dist:f16,f17,f18
python-simplejson

@ -609,6 +609,15 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
# transiently, meaning we avoid the issue of it not being cleaned
# out properly. Note we do this before the track-depends below.
pip_install hgtools
# The version of python-nose in the RHEL6 repo is incompatible
# with Tempest. As a workaround:
# Install nose 1.1 (Tempest-compatible) from EPEL
install_package python-nose1.1
# Add a symlink for the new nosetests to allow tox for Tempest to
# work unmolested.
sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests
fi
TRACK_DEPENDS=${TRACK_DEPENDS:-False}