From d91718654cc890a76bd5702112f29ac004bf260c Mon Sep 17 00:00:00 2001 From: James Polley Date: Mon, 24 Feb 2014 18:56:36 +1100 Subject: [PATCH] Make sure gawk is installed extract_docs.awk (used to extract devtest.rst from devtest.sh, and similiarly with other scripts that have docs auto-generated) does not work in mawk, which is the default in precise. gawk is already the default choice in Fedora 19, and seems to be the default in later versions of Ubuntu. Haven't tested Debian. Change-Id: I00cf5137d8e39c78a5d52b2cf094365a56deb353 --- 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 37a21c3972..de40531a8d 100644 --- a/modules/jenkins/manifests/params.pp +++ b/modules/jenkins/manifests/params.pp @@ -12,6 +12,7 @@ class jenkins::params { $python_netaddr_package = 'python-netaddr' # packages needed by slaves $ant_package = 'ant' + $awk_package = 'gawk' $asciidoc_package = 'asciidoc' $curl_package = 'curl' $docbook_xml_package = 'docbook-style-xsl' @@ -91,6 +92,7 @@ class jenkins::params { $python_netaddr_package = 'python-netaddr' # packages needed by slaves $ant_package = 'ant' + $awk_package = 'gawk' $asciidoc_package = 'asciidoc' $curl_package = 'curl' $docbook_xml_package = 'docbook-xml' diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index be44b51852..aec58c3240 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -30,6 +30,7 @@ class jenkins::slave( # Packages that most jenkins slaves (eg, unit test runners) need $standard_packages = [ $::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::curl_package, $::jenkins::params::docbook_xml_package, # for building openstack docs