opendev
/
puppet-jenkins
Code Issues Proposed changes

Add Suse family support to jenkins puppet module 

Change-Id: I5cf6481aed0bc6e371fe84e0b9f2d632785304eb
This commit is contained in:
Dirk Mueller 2017-02-25 10:13:45 +01:00
parent 89d89683e3
commit 4e38e6715a
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/params.pp
View File

@ -33,6 +33,19 @@ class jenkins::params {
$cgred_require = Package['cgroups']
}
}
'Suse': {
$jdk_package = 'java-1_8_0-openjdk-devel'
$ccache_package = 'ccache'
$python_netaddr_package = 'python-netaddr'
$cgroups_package = 'libcgroup1'
$cgroups_tools_package = 'libcgroup-tools'
$cgconfig_require = [
Package['libcgroup-tools']
]
$cgred_require = [
Package['libcgroup-tools']
]
}
'Debian': {
# common packages
$ccache_package = 'ccache'
@ -66,7 +79,7 @@ class jenkins::params {
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian, RedHat or Suse (slaves only).")
}
}
}

9
manifests/slave.pp
View File

@ -62,6 +62,13 @@ class jenkins::slave(
}
}
}
'Suse': {
exec { 'zypper devel pattern install':
unless => '/usr/bin/zypper -n info -t pattern devel_basis | /bin/grep -q "Installed.*yes"',
command => '/usr/bin/zypper -n in -t pattern devel_basis',
timeout => 1800,
}
}
'Debian': {
# install build-essential package group
package { 'build-essential':
@ -95,7 +102,7 @@ class jenkins::slave(
}
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat/Suse (slaves only).")
}
}

3
templates/cgconfig.erb
View File

@ -1,6 +1,9 @@
<% if @operatingsystem == "Fedora" then
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
# mount section is needed. %>
<% elsif @operatingsystem == "Suse" then
# SUSE auto-mounts subsystems under /sys/fs/cgroup/ already, so no
# mount section is needed. %>
<% elsif @osfamily == "RedHat" then %>
mount {