From e9bf54b03a405948d32d9ca5bca252191ca1c856 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 15 Mar 2013 00:15:39 +0000 Subject: [PATCH] Revert "Force python2.6 during python 2.6 jobs." This reverts commit 80610a86a9c998aa876ae79f81523e0423363084 Change-Id: I3de4134669ff972c60797393783dd1d02763feb7 Reviewed-on: https://review.openstack.org/24493 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- modules/jenkins/files/slave_scripts/run-tox.sh | 2 +- .../files/jenkins_job_builder/config/macros.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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