Add Suse family support to jenkins puppet module
Change-Id: I5cf6481aed0bc6e371fe84e0b9f2d632785304eb
This commit is contained in:
parent
89d89683e3
commit
b507108750
@ -33,6 +33,19 @@ class jenkins::params {
|
|||||||
$cgred_require = Package['cgroups']
|
$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': {
|
'Debian': {
|
||||||
# common packages
|
# common packages
|
||||||
$ccache_package = 'ccache'
|
$ccache_package = 'ccache'
|
||||||
@ -66,7 +79,7 @@ class jenkins::params {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
default: {
|
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).")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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': {
|
'Debian': {
|
||||||
# install build-essential package group
|
# install build-essential package group
|
||||||
package { 'build-essential':
|
package { 'build-essential':
|
||||||
@ -95,7 +102,7 @@ class jenkins::slave(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
default: {
|
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).")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
<% if @operatingsystem == "Fedora" then
|
<% if @operatingsystem == "Fedora" then
|
||||||
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
|
# Fedora auto-mounts subsystems under /sys/fs/cgroup/ already, so no
|
||||||
# mount section is needed. %>
|
# 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 %>
|
<% elsif @osfamily == "RedHat" then %>
|
||||||
|
|
||||||
mount {
|
mount {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user