opendev/system-config
Code Issues Proposed changes

Revert "Force python2.6 during python 2.6 jobs."

Browse Source 
This reverts commit 80610a86a9c998aa876ae79f81523e0423363084

Change-Id: I3de4134669ff972c60797393783dd1d02763feb7
Reviewed-on: https://review.openstack.org/24493
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-03-15 00:15:39 +00:00 committed by Jenkins
parent 24424d9e09
commit e9bf54b03a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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:"

8
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -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