Merge "Install graphviz on jenkins slaves for docs"

This commit is contained in:
Jenkins 2013-11-19 01:51:48 +00:00 committed by Gerrit Code Review
commit 28e772bf2d
2 changed files with 3 additions and 0 deletions

View File

@ -17,6 +17,7 @@ class jenkins::params {
$docbook5_xml_package = 'docbook5-schemas' $docbook5_xml_package = 'docbook5-schemas'
$docbook5_xsl_package = 'docbook5-style-xsl' $docbook5_xsl_package = 'docbook5-style-xsl'
$firefox_package = 'firefox' $firefox_package = 'firefox'
$graphviz_package = 'graphviz'
$mod_wsgi_package = 'mod_wsgi' $mod_wsgi_package = 'mod_wsgi'
$libcurl_dev_package = 'libcurl-devel' $libcurl_dev_package = 'libcurl-devel'
$ldap_dev_package = 'openldap-devel' $ldap_dev_package = 'openldap-devel'
@ -77,6 +78,7 @@ class jenkins::params {
$docbook5_xml_package = 'docbook5-xml' $docbook5_xml_package = 'docbook5-xml'
$docbook5_xsl_package = 'docbook-xsl' $docbook5_xsl_package = 'docbook-xsl'
$firefox_package = 'firefox' $firefox_package = 'firefox'
$graphviz_package = 'graphviz'
$mod_wsgi_package = 'libapache2-mod-wsgi' $mod_wsgi_package = 'libapache2-mod-wsgi'
$libcurl_dev_package = 'libcurl4-gnutls-dev' $libcurl_dev_package = 'libcurl4-gnutls-dev'
$ldap_dev_package = 'libldap2-dev' $ldap_dev_package = 'libldap2-dev'

View File

@ -35,6 +35,7 @@ class jenkins::slave(
$::jenkins::params::docbook5_xml_package, # for building openstack docs $::jenkins::params::docbook5_xml_package, # for building openstack docs
$::jenkins::params::docbook5_xsl_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::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::firefox_package, # for selenium tests
$::jenkins::params::mod_wsgi_package, $::jenkins::params::mod_wsgi_package,
$::jenkins::params::libcurl_dev_package, $::jenkins::params::libcurl_dev_package,