opendev/system-config
Code Issues Proposed changes

Add Pillow C deps to thick slaves

Browse Source 
Pillow's 3.0.0 release requires libjpeg and zlib development headers to
build against. Make sure these packages are installed on the thick
slaves so that things like doc builds can run.

Change-Id: I8da7dd95ae24cf06dc7bdc300fcf39947a6df093
This commit is contained in:
Clark Boylan 2015-10-01 15:10:18 -07:00
parent 0681fd819d
commit f66693d44f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -94,6 +94,8 @@ class openstack_project::jenkins_params {
$uuid_dev = "libuuid-devel"
$swig = "swig"
$libjpeg_dev = "libjpeg-turbo-devel"
$zlib_dev = "zlib-devel"
}
'Debian': {
# packages needed by slaves
@ -174,6 +176,8 @@ class openstack_project::jenkins_params {
$uuid_dev = "uuid-dev"
$swig = "swig"
$libjpeg_dev = "libjpeg-dev"
$zlib_dev = "zlib1g-dev"
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")

2
modules/openstack_project/manifests/thick_slave.pp
View File

@ -53,6 +53,8 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::uuid_dev, # for oslo.messaging pyngus/proton
$::openstack_project::jenkins_params::swig, # for oslo.messaging pyngus/proton
$::openstack_project::jenkins_params::libjpeg_dev, # for sphinx Pillow dep
$::openstack_project::jenkins_params::zlib_dev, # for sphinx Pillow dep
]
package { $packages: