opendev
/
system-config
Code Issues Proposed changes

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
This commit is contained in:
James Polley 2014-02-24 18:56:36 +11:00
parent 3fa3af0ab9
commit d91718654c
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'
# 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'

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
$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