openstack/devstack
Code Issues Proposed changes

Install nose 1.1 from EPEL for RHEL.

Browse Source 
* It's not possible to prevent python-nose (which is not compatible
   with Tempest) from being installed since so many os packages
   dependent on it.
 * This patch installs python-nose1.1 from EPEL and adds a
   /usr/local/bin symlink for nosetests1.1 so that invocations for
   Tempest will work as expected.

Change-Id: I756d1ca5eda127dcdd2efb047c8e14dd344f710d
This commit is contained in:
Maru Newby 2013-05-22 05:50:21 +00:00
parent 6436067306
commit 4a9f26bf20
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/rpms/horizon
View File

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

3
files/rpms/swift
View File

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

9
stack.sh
View File

@ -609,6 +609,15 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then
# transiently, meaning we avoid the issue of it not being cleaned # transiently, meaning we avoid the issue of it not being cleaned
# out properly. Note we do this before the track-depends below. # out properly. Note we do this before the track-depends below.
pip_install hgtools 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 fi
TRACK_DEPENDS=${TRACK_DEPENDS:-False} TRACK_DEPENDS=${TRACK_DEPENDS:-False}