opendev
/
system-config
Code Issues Proposed changes

Move curl to jenkins_common.pp 

After switching to ubuntu-trusty and project that use
other-requirements.txt for bindep, log uploads will fail.  So rather
then forcing all projects to include curl in other-requirements.txt,
we'll install it with puppet.

Our entry point is ::openstack_project::single_use_slave.

Change-Id: Icade064bd32c2179836f4d1c3d2ec91425422d02
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-03-04 13:39:44 -05:00
parent 744b62c6af
commit 93ab8feca6
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -10,7 +10,6 @@ class openstack_project::jenkins_params {
$ant_package = 'ant'
$awk_package = 'gawk'
$asciidoc_package = 'asciidoc'
$curl_package = 'curl'
$docbook_xml_package = 'docbook-style-xsl'
$docbook5_xml_package = 'docbook5-schemas'
$docbook5_xsl_package = 'docbook5-style-xsl'
@ -102,7 +101,6 @@ class openstack_project::jenkins_params {
$ant_package = 'ant'
$awk_package = 'gawk'
$asciidoc_package = 'asciidoc'
$curl_package = 'curl'
$docbook_xml_package = 'docbook-xml'
$docbook5_xml_package = 'docbook5-xml'
$docbook5_xsl_package = 'docbook-xsl'

7
modules/openstack_project/manifests/slave_common.pp
View File

@ -90,6 +90,13 @@ class openstack_project::slave_common(
}
}
# needed by jenkins/jobs
if ! defined(Package['curl']) {
package { 'curl':
ensure => present,
}
}
# install linux-headers depending on OS version
case $::osfamily {
'RedHat': {

1
modules/openstack_project/manifests/thick_slave.pp
View File

@ -11,7 +11,6 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::ant_package, # for building buck
$::openstack_project::jenkins_params::awk_package, # for building extract_docs.awk to work correctly
$::openstack_project::jenkins_params::asciidoc_package, # for building gerrit/building openstack docs
$::openstack_project::jenkins_params::curl_package,
$::openstack_project::jenkins_params::docbook_xml_package, # for building openstack docs
$::openstack_project::jenkins_params::docbook5_xml_package, # for building openstack docs
$::openstack_project::jenkins_params::docbook5_xsl_package, # for building openstack docs