opendev/system-config
Code Issues Proposed changes

Workaround tox 1.6 pypi workaround

Browse Source 
tox 1.6 tries to be helpful and set your index server for easy_install
as well. (die easy_install die) But, its hack around the problem
conflicts with our hack around the problem. Thus, an incomplete solution
that at least fixes core projects, is to set TOX_INDEX_URL in the
environment so that it will at least set the right thing.

Closes-Bug: 1212751
Change-Id: I0bc29a35fba3b308a7b52778baa575818533ffd5
This commit is contained in:
Monty Taylor
2013-08-16 14:36:12 -04:00
parent 30fd70d0d9
commit 265f476629
11 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins/files/slave_scripts/run-cover.sh
View File

@@ -16,7 +16,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
export NOSE_COVER_HTML=1 export NOSE_COVER_HTML=1

2
modules/jenkins/files/slave_scripts/run-docs.sh
View File

@@ -19,7 +19,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
venv=venv venv=venv

2
modules/jenkins/files/slave_scripts/run-pep8.sh
View File

@@ -26,7 +26,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
set -o pipefail set -o pipefail
tox -v -epep8 | tee pep8.txt tox -v -epep8 | tee pep8.txt

2
modules/jenkins/files/slave_scripts/run-pyflakes.sh
View File

@@ -26,6 +26,6 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
tox -v -epyflakes tox -v -epyflakes

2
modules/jenkins/files/slave_scripts/run-pylint.sh
View File

@@ -26,7 +26,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
set -o pipefail set -o pipefail
tox -v -epylint | tee pylint.txt tox -v -epylint | tee pylint.txt

2
modules/jenkins/files/slave_scripts/run-selenium.sh
View File

@@ -19,7 +19,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
venv=venv venv=venv

2
modules/jenkins/files/slave_scripts/run-tarball.sh
View File

@@ -26,7 +26,7 @@ then
exit 1 exit 1
fi fi
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
rm -f dist/*.tar.gz rm -f dist/*.tar.gz
tox -evenv python setup.py sdist tox -evenv python setup.py sdist

2
modules/jenkins/files/slave_scripts/run-tox.sh
View File

@@ -38,7 +38,7 @@ trap "rm -rf $TMPDIR" EXIT
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre
/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project
# Workaround the combo of tox running setup.py outside of virtualenv # Workaround the combo of tox running setup.py outside of virtualenv
# and RHEL having an old distribute. The next line can be removed # and RHEL having an old distribute. The next line can be removed

3
modules/jenkins/files/slave_scripts/select-mirror.sh
View File

@@ -34,10 +34,11 @@ rm -f ~/.pip/pip.conf
# outside world. # outside world.
if [ "$org" == "openstack" ] && [ "$project" == "requirements" ] if [ "$org" == "openstack" ] && [ "$project" == "requirements" ]
then then
exit 0 echo "Not changing mirror"
# For OpenStack projects, use the pypi.openstack.org mirror exclusively # For OpenStack projects, use the pypi.openstack.org mirror exclusively
elif [ "$org" == "openstack" ] elif [ "$org" == "openstack" ]
then then
export TOX_INDEX_URL='http://pypi.openstack.org/openstack'
cat <<EOF > ~/.pydistutils.cfg cat <<EOF > ~/.pydistutils.cfg
[easy_install] [easy_install]
index_url = http://pypi.openstack.org/openstack index_url = http://pypi.openstack.org/openstack

2
modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml
View File

@@ -6,7 +6,7 @@
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
/usr/local/jenkins/slave_scripts/select-mirror.sh openstack-dev hacking source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack-dev hacking
tox -e integration {target-org} {target-project} tox -e integration {target-org} {target-project}
publishers: publishers:

2
modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml
View File

@@ -6,7 +6,7 @@
- gerrit-git-prep - gerrit-git-prep
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
/usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements
virtualenv --clear .venv virtualenv --clear .venv
PIP_ARGS="" PIP_ARGS=""
REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt" REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt"