diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index c1b63e8ec1..bdcebbfa75 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -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':