opendev
/
system-config
Code Issues Proposed changes

Temporarily pin tox<=1.6.1 

The release of tox 1.7.0 happened today, and we're clearly not ready
for it yet. Stop the bleeding by sticking with 1.6.1 while we try to
sort out the issues.

Change-Id: I3289828ea9a0edadcf40c06212b0925957b99f73
Related-Bug: #1274135
This commit is contained in:
Jeremy Stanley 2014-01-29 14:23:02 +00:00
parent 265bd8fe1d
commit 7b029c87d1
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/jenkins/manifests/slave.pp
View File

@ -148,9 +148,9 @@ class jenkins::slave(
}
# Packages that need to be installed from pip
# Temporarily removed tox so we can pin it separately (see below)
$pip_packages = [
'setuptools-git',
'tox',
]
if $python3 {
@ -165,12 +165,24 @@ class jenkins::slave(
provider => pip3,
require => Class[pip::python3],
}
# Temporarily handle tox separately so we can pin it
package { 'tox':
ensure => '1.6.1',
provider => pip3,
require => Class['pip::python3'],
}
} else {
package { $pip_packages:
ensure => latest, # we want the latest from these
provider => pip,
require => Class[pip],
}
# Temporarily handle tox separately so we can pin it
package { 'tox':
ensure => '1.6.1',
provider => pip,
require => Class['pip'],
}
}
package { 'python-subunit':