From 7c178f129a0dd8f2636e439cee37b7a50e5fa41d Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 28 Feb 2014 17:11:12 +0100 Subject: [PATCH] Install memcached on slaves This is needed to run Tooz integration tests. Change-Id: Ibaa2c4adf81a50465910572a6b6d145640476a51 --- modules/jenkins/manifests/params.pp | 4 ++++ modules/jenkins/manifests/slave.pp | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp index a85c745b54..55c1aad103 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -38,6 +38,8 @@ class jenkins::params { $libffi_dev_package = 'libffi-devel' # FIXME: No Maven packages on RHEL #$maven_package = 'maven' + # For tooz unit tests + $memcached_package = 'memcached' # For Ceilometer unit tests $mongodb_package = 'mongodb-server' $pandoc_package = 'pandoc' @@ -119,6 +121,8 @@ class jenkins::params { $libxslt_dev_package = 'libxslt1-dev' $libffi_dev_package = 'libffi-dev' $maven_package = 'maven2' + # For tooz unit tests + $memcached_package = 'memcached' # For Ceilometer unit tests $mongodb_package = 'mongodb' $pandoc_package = 'pandoc' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index 803eb58c0f..8499b6c69c 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -46,6 +46,7 @@ class jenkins::slave( $::jenkins::params::librrd_dev_package, # for python-rrdtool, used by kwapi $::jenkins::params::libtidy_package, # for python-tidy, used by sphinxcontrib-docbookrestapi $::jenkins::params::libsasl_dev, # for keystone ldap auth integration + $::jenkins::params::memcached_package, # for tooz unit tests $::jenkins::params::mongodb_package, # for ceilometer unit tests $::jenkins::params::mysql_dev_package, $::jenkins::params::nspr_dev_package, # for spidermonkey, used by ceilometer