* 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
| ... | ... |
@@ -16,8 +16,7 @@ python-kombu |
| 16 | 16 |
python-migrate |
| 17 | 17 |
python-mox |
| 18 | 18 |
python-netaddr |
| 19 |
-# RHEL6's python-nose is incompatible with Tempest |
|
| 20 |
-python-nose #dist:f16,f17,f18 |
|
| 19 |
+python-nose |
|
| 21 | 20 |
python-paste #dist:f16,f17,f18 |
| 22 | 21 |
python-paste-deploy #dist:f16,f17,f18 |
| 23 | 22 |
python-pep8 |
| ... | ... |
@@ -7,8 +7,7 @@ python-devel |
| 7 | 7 |
python-eventlet |
| 8 | 8 |
python-greenlet |
| 9 | 9 |
python-netifaces |
| 10 |
-# RHEL6's python-nose is incompatible with Tempest |
|
| 11 |
-python-nose # dist:f16,f17,f18 |
|
| 10 |
+python-nose |
|
| 12 | 11 |
python-paste-deploy # dist:f16,f17,f18 |
| 13 | 12 |
python-setuptools # dist:f16,f17,f18 |
| 14 | 13 |
python-simplejson |
| ... | ... |
@@ -609,6 +609,15 @@ if [[ is_fedora && $DISTRO =~ (rhel6) ]]; then |
| 609 | 609 |
# transiently, meaning we avoid the issue of it not being cleaned |
| 610 | 610 |
# out properly. Note we do this before the track-depends below. |
| 611 | 611 |
pip_install hgtools |
| 612 |
+ |
|
| 613 |
+ # The version of python-nose in the RHEL6 repo is incompatible |
|
| 614 |
+ # with Tempest. As a workaround: |
|
| 615 |
+ |
|
| 616 |
+ # Install nose 1.1 (Tempest-compatible) from EPEL |
|
| 617 |
+ install_package python-nose1.1 |
|
| 618 |
+ # Add a symlink for the new nosetests to allow tox for Tempest to |
|
| 619 |
+ # work unmolested. |
|
| 620 |
+ sudo ln -sf /usr/bin/nosetests1.1 /usr/local/bin/nosetests |
|
| 612 | 621 |
fi |
| 613 | 622 |
|
| 614 | 623 |
TRACK_DEPENDS=${TRACK_DEPENDS:-False}
|