opendev/system-config
Code Issues Proposed changes

Fix rubygems dependencies in jenkins::slave

Browse Source 
The rubygems package is only installed on non bare slaves but the slave
manifest attempts to install the puppet-lint gem on all slaves which
requires the rubygems package. Only attempt to install gems when the
slave is a not a bare slave.

Change-Id: Ifc09d15340eed97b35a865a1475a52172f7c9b25
Reviewed-on: https://review.openstack.org/14260
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-10-09 16:16:56 -07:00 committed by Jenkins
parent c6059ce5d6
commit 50736a41d7
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,19 @@ class jenkins::slave($ssh_key, $sudo = false, $bare = false, $user = true) {
ensure => present, ensure => present,
} }
if ($bare == false) {
$gem_packages = [
'puppet-lint',
'puppetlabs_spec_helper',
]
package { $gem_packages:
ensure => latest,
provider => gem,
require => Package['rubygems'],
}
}
# Packages that need to be installed from pip # Packages that need to be installed from pip
$pip_packages = [ $pip_packages = [
"setuptools-git", "setuptools-git",
@ -66,17 +79,6 @@ class jenkins::slave($ssh_key, $sudo = false, $bare = false, $user = true) {
require => Class[pip] require => Class[pip]
} }
$gem_packages = [
'puppet-lint',
'puppetlabs_spec_helper',
]
package { $gem_packages:
ensure => latest,
provider => gem,
require => Package['rubygems'],
}
package { 'git-review': package { 'git-review':
ensure => '1.17', ensure => '1.17',
provider => pip, provider => pip,