diff --git a/modules/jenkins/files/slave_scripts/run-tox.sh b/modules/jenkins/files/slave_scripts/run-tox.sh index 0349dc1fce..4bbfc2c39b 100755 --- a/modules/jenkins/files/slave_scripts/run-tox.sh +++ b/modules/jenkins/files/slave_scripts/run-tox.sh @@ -32,7 +32,7 @@ trap "rm -rf $TMPDIR" EXIT sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh pre -$PYTHON `which tox` -e$venv +tox -e$venv result=$? echo "Begin pip freeze output from test virtualenv:" diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index f6d2b4f5ad..565def805b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -79,22 +79,22 @@ - builder: name: python26 builders: - - shell: "PYTHON=python2.6 /usr/local/jenkins/slave_scripts/run-tox.sh 26 {github-org} {project}" + - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26 {github-org} {project}" - builder: name: python27 builders: - - shell: "PYTHON=python2.7 /usr/local/jenkins/slave_scripts/run-tox.sh 27 {github-org} {project}" + - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27 {github-org} {project}" - builder: name: python26-folsom builders: - - shell: "PYTHON=python2.6 /usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom {github-org} {project}" + - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom {github-org} {project}" - builder: name: python27-folsom builders: - - shell: "PYTHON=python2.7 /usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom {github-org} {project}" + - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom {github-org} {project}" - builder: name: assert-no-extra-files