opendev/system-config
Code Issues Proposed changes

Fix Jenkins Jobs XML and missing package

Browse Source 
Change-Id: Idcc8e75cdfdef1dd4d9b4ee7fb2e4f5247cf1e9f
This commit is contained in:
Andrew Hutchings 2012-05-21 15:24:15 +01:00
parent 2948743570
commit ff93879b18
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/jenkins_jobs/files/modules/properties.py
View File

@ -35,11 +35,6 @@ class properties(object):
XML.SubElement(throttle, 'throttleEnabled').text = 'false'
XML.SubElement(throttle, 'throttleOption').text = 'project'
XML.SubElement(throttle, 'configVersion').text = '1'
XML.SubElement(einfo, 'loadFilesFromMaster').text = 'false'
XML.SubElement(env, 'on').text = 'true'
XML.SubElement(env, 'keepJenkinsSystemVariables').text = 'true'
XML.SubElement(env, 'keepBuildVariables').text = 'true'
XML.SubElement(env, 'contributors')
if main.has_key('authenticatedBuild') and main['authenticatedBuild'] == 'true':
security = XML.SubElement(properties, 'hudson.security.AuthorizationMatrixProperty')
XML.SubElement(security, 'permission').text = 'hudson.model.Item.Build:authenticated'

7
modules/jenkins_jobs/manifests/init.pp
View File

@ -1,11 +1,16 @@
class jenkins_jobs($site, $projects) {
package { 'python-yaml':
ensure => 'present'
}
file { '/usr/local/jenkins_jobs':
owner => 'root',
group => 'root',
mode => 755,
ensure => 'directory',
recurse => true,
source => ['puppet:///modules/jenkins_jobs/']
source => ['puppet:///modules/jenkins_jobs/'],
require => Package['python-yaml']
}
file { '/usr/local/jenkins_jobs/jenkins_jobs.ini':