From 03244b810bcd6c7ab465156b6d36f9f146893076 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 19 Jul 2013 15:09:30 -0700
Subject: [PATCH] Install libffi-dev on our slaves.
Some projects have a dependency on xattr which has a dependency on cffi
which has a dependency on libffi's development files. Install these dev
files so that xattr can be installed properly when testing.
Change-Id: If2d09285ae95d7869b3c1335c39d2642288326c1
---
modules/jenkins/manifests/params.pp | 2 ++
modules/jenkins/manifests/slave.pp | 1 +
2 files changed, 3 insertions(+)
diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index b282c9e33d..ba9a4996f2 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -31,6 +31,7 @@ class jenkins::params {
$libxml2_package = 'libxml2'
$libxml2_dev_package = 'libxml2-devel'
$libxslt_dev_package = 'libxslt-devel'
+ $libffi_dev_package = 'libffi-devel'
# FIXME: No Maven packages on RHEL
#$maven_package = 'maven'
# For Ceilometer unit tests
@@ -93,6 +94,7 @@ class jenkins::params {
$libxml2_package = 'libxml2-utils'
$libxml2_dev_package = 'libxml2-dev'
$libxslt_dev_package = 'libxslt1-dev'
+ $libffi_dev_package = 'libffi-dev'
$maven_package = 'maven2'
# For Ceilometer unit tests
$mongodb_package = 'mongodb'
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 79418ca947..74e75f4efd 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -47,6 +47,7 @@ class jenkins::slave(
$::jenkins::params::libxml2_package,
$::jenkins::params::libxml2_dev_package, # for xmllint, need for wadl
$::jenkins::params::libxslt_dev_package,
+ $::jenkins::params::libffi_dev_package, # xattr's cffi dependency
$::jenkins::params::pandoc_package, #for docs, markdown->docbook, bug 924507
$::jenkins::params::pkgconfig_package, # for spidermonkey, used by ceilometer
$::jenkins::params::pyflakes_package,