opendev/system-config
Code Issues Proposed changes

Merge "Make sure gawk is installed"

Browse Source
This commit is contained in:
Jenkins 2014-02-24 21:20:33 +00:00 committed by Gerrit Code Review
commit 53fe598325
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins/manifests/params.pp
View File

@ -12,6 +12,7 @@ class jenkins::params {
$python_netaddr_package = 'python-netaddr' $python_netaddr_package = 'python-netaddr'
# packages needed by slaves # packages needed by slaves
$ant_package = 'ant' $ant_package = 'ant'
$awk_package = 'gawk'
$asciidoc_package = 'asciidoc' $asciidoc_package = 'asciidoc'
$curl_package = 'curl' $curl_package = 'curl'
$docbook_xml_package = 'docbook-style-xsl' $docbook_xml_package = 'docbook-style-xsl'
@ -91,6 +92,7 @@ class jenkins::params {
$python_netaddr_package = 'python-netaddr' $python_netaddr_package = 'python-netaddr'
# packages needed by slaves # packages needed by slaves
$ant_package = 'ant' $ant_package = 'ant'
$awk_package = 'gawk'
$asciidoc_package = 'asciidoc' $asciidoc_package = 'asciidoc'
$curl_package = 'curl' $curl_package = 'curl'
$docbook_xml_package = 'docbook-xml' $docbook_xml_package = 'docbook-xml'

1
modules/jenkins/manifests/slave.pp
View File

@ -30,6 +30,7 @@ class jenkins::slave(
# Packages that most jenkins slaves (eg, unit test runners) need # Packages that most jenkins slaves (eg, unit test runners) need
$standard_packages = [ $standard_packages = [
$::jenkins::params::ant_package, # for building buck $::jenkins::params::ant_package, # for building buck
$::jenkins::params::awk_package, # for building extract_docs.awk to work correctly
$::jenkins::params::asciidoc_package, # for building gerrit/building openstack docs $::jenkins::params::asciidoc_package, # for building gerrit/building openstack docs
$::jenkins::params::curl_package, $::jenkins::params::curl_package,
$::jenkins::params::docbook_xml_package, # for building openstack docs $::jenkins::params::docbook_xml_package, # for building openstack docs