From f66693d44feb01ce8820ac94279424f4da97d138 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 1 Oct 2015 15:10:18 -0700 Subject: [PATCH] Add Pillow C deps to thick slaves 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 --- modules/openstack_project/manifests/jenkins_params.pp | 4 ++++ modules/openstack_project/manifests/thick_slave.pp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index bbb14360b4..a2083c01be 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -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).") diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index acedcad995..d83c1e3bd7 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -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: