diff --git a/modules/jenkins/files/slave_scripts/run-cover.sh b/modules/jenkins/files/slave_scripts/run-cover.sh index a25760fbc1..d9e16cdea0 100755 --- a/modules/jenkins/files/slave_scripts/run-cover.sh +++ b/modules/jenkins/files/slave_scripts/run-cover.sh @@ -16,7 +16,7 @@ then exit 1 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 diff --git a/modules/jenkins/files/slave_scripts/run-docs.sh b/modules/jenkins/files/slave_scripts/run-docs.sh index f227a1e7cd..a3e6fc5ad2 100755 --- a/modules/jenkins/files/slave_scripts/run-docs.sh +++ b/modules/jenkins/files/slave_scripts/run-docs.sh @@ -19,7 +19,7 @@ then exit 1 fi -/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project +source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project venv=venv diff --git a/modules/jenkins/files/slave_scripts/run-pep8.sh b/modules/jenkins/files/slave_scripts/run-pep8.sh index ed3fe91592..4a3ad327a5 100644 --- a/modules/jenkins/files/slave_scripts/run-pep8.sh +++ b/modules/jenkins/files/slave_scripts/run-pep8.sh @@ -26,7 +26,7 @@ then exit 1 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 tox -v -epep8 | tee pep8.txt diff --git a/modules/jenkins/files/slave_scripts/run-pyflakes.sh b/modules/jenkins/files/slave_scripts/run-pyflakes.sh index 07079dafa2..30756b7cb7 100644 --- a/modules/jenkins/files/slave_scripts/run-pyflakes.sh +++ b/modules/jenkins/files/slave_scripts/run-pyflakes.sh @@ -26,6 +26,6 @@ then exit 1 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 diff --git a/modules/jenkins/files/slave_scripts/run-pylint.sh b/modules/jenkins/files/slave_scripts/run-pylint.sh index b0c76ee91b..a0dd2e3b6d 100644 --- a/modules/jenkins/files/slave_scripts/run-pylint.sh +++ b/modules/jenkins/files/slave_scripts/run-pylint.sh @@ -26,7 +26,7 @@ then exit 1 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 tox -v -epylint | tee pylint.txt diff --git a/modules/jenkins/files/slave_scripts/run-selenium.sh b/modules/jenkins/files/slave_scripts/run-selenium.sh index 8f45c99937..a5991222e0 100755 --- a/modules/jenkins/files/slave_scripts/run-selenium.sh +++ b/modules/jenkins/files/slave_scripts/run-selenium.sh @@ -19,7 +19,7 @@ then exit 1 fi -/usr/local/jenkins/slave_scripts/select-mirror.sh $org $project +source /usr/local/jenkins/slave_scripts/select-mirror.sh $org $project venv=venv diff --git a/modules/jenkins/files/slave_scripts/run-tarball.sh b/modules/jenkins/files/slave_scripts/run-tarball.sh index 175af55f86..3d60781d31 100644 --- a/modules/jenkins/files/slave_scripts/run-tarball.sh +++ b/modules/jenkins/files/slave_scripts/run-tarball.sh @@ -26,7 +26,7 @@ then exit 1 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 tox -evenv python setup.py sdist diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 085cbf6c09..7a11cdd06b 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -38,7 +38,7 @@ trap "rm -rf $TMPDIR" EXIT 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 # and RHEL having an old distribute. The next line can be removed diff --git a/modules/jenkins/files/slave_scripts/select-mirror.sh b/modules/jenkins/files/slave_scripts/select-mirror.sh index 689f31384f..374c4e33c6 100755 --- a/modules/jenkins/files/slave_scripts/select-mirror.sh +++ b/modules/jenkins/files/slave_scripts/select-mirror.sh @@ -34,10 +34,11 @@ rm -f ~/.pip/pip.conf # outside world. if [ "$org" == "openstack" ] && [ "$project" == "requirements" ] then - exit 0 + echo "Not changing mirror" # For OpenStack projects, use the pypi.openstack.org mirror exclusively elif [ "$org" == "openstack" ] then + export TOX_INDEX_URL='http://pypi.openstack.org/openstack' cat < ~/.pydistutils.cfg [easy_install] index_url = http://pypi.openstack.org/openstack diff --git a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml index 259442a87a..9ab85a2cca 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/hacking.yaml @@ -6,7 +6,7 @@ - gerrit-git-prep - shell: | #!/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} publishers: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index d184d2fb15..fa485d11f7 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -6,7 +6,7 @@ - gerrit-git-prep - shell: | #!/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 PIP_ARGS="" REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt"