From d216f0826e2032d8ad1452dec88ba76ebc823653 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Mon, 18 Nov 2013 15:44:27 +1100 Subject: [PATCH] Install graphviz on jenkins slaves for docs Some docs use sphinx.ext.graphviz, such as turbo-hipster, and require this package to be present. Change-Id: Ide2c99d923f56231f9342cd5551dcc29910ec2fb --- 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 5af100e438..dc6c72c121 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -17,6 +17,7 @@ class jenkins::params { $docbook5_xml_package = 'docbook5-schemas' $docbook5_xsl_package = 'docbook5-style-xsl' $firefox_package = 'firefox' + $graphviz_package = 'graphviz' $mod_wsgi_package = 'mod_wsgi' $libcurl_dev_package = 'libcurl-devel' $ldap_dev_package = 'openldap-devel' @@ -77,6 +78,7 @@ class jenkins::params { $docbook5_xml_package = 'docbook5-xml' $docbook5_xsl_package = 'docbook-xsl' $firefox_package = 'firefox' + $graphviz_package = 'graphviz' $mod_wsgi_package = 'libapache2-mod-wsgi' $libcurl_dev_package = 'libcurl4-gnutls-dev' $ldap_dev_package = 'libldap2-dev' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index f807352bb6..377a4259fa 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -35,6 +35,7 @@ class jenkins::slave( $::jenkins::params::docbook5_xml_package, # for building openstack docs $::jenkins::params::docbook5_xsl_package, # for building openstack docs $::jenkins::params::gnome_doc_package, # for generating translation files for docs + $::jenkins::params::graphviz_package, # for generating graphs in docs $::jenkins::params::firefox_package, # for selenium tests $::jenkins::params::mod_wsgi_package, $::jenkins::params::libcurl_dev_package,