From 1d2db8a09ef79eb10300126daebe1685fca92b2b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 9 Apr 2013 17:17:06 -0400 Subject: [PATCH] Work around tox+rhel+distribute+setup_requires. Trying to use setup_requires with the version of distribute on rhel doesn't work because that version doesn't properly re-import itself. When tox gets involved, it tries to run setup.py sdist outside of the created virtualenv, which means it's ignoring our declared deps for that action. The bug in distribute is worked around by running any setup.py command once and letting it fail, then running again. So - python setup.py --version is the cheapest setup.py command to trigger the behavior that needs to happen. Throw the error results to /dev/null because we expect there to be a traceback and we don't want to confuse people reading log outputs. Leave stdout because it's good to be able to track which setup_requires requirements it is pulling down before it dies on not actually being able to use them. Change-Id: I982a08ffa5784ed97f70f41d91a58da66b7498b6 Reviewed-on: https://review.openstack.org/26533 Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/run-tox.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 6909c37d6c..ab8e79b3d6 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -40,6 +40,11 @@ sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project +# Workaround the combo of tox running setup.py outside of virtualenv +# and RHEL having an old distribute. The next line can be removed +# when either get fixed. +python setup.py --version 2>/dev/null + tox -e$venv result=$?