opendev/system-config
Code Issues Proposed changes

Merge "Fixes to Jenkins Job filler"

Browse Source
This commit is contained in:
Jenkins 2012-03-28 16:19:06 +00:00 committed by Gerrit Code Review
commit 013408df49
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/jenkins_jobs/manifests/add_jobs.pp
View File

@ -74,7 +74,7 @@ define jenkins_jobs::add_jobs($site) {
jenkins_jobs::job { "${name}-venv": jenkins_jobs::job { "${name}-venv":
site => "${site}", site => "${site}",
project => "${job}", project => "${name}",
job => "venv", job => "venv",
triggers => template("jenkins_jobs/trigger_timed_midnight.xml.erb"), triggers => template("jenkins_jobs/trigger_timed_midnight.xml.erb"),
builders => template("jenkins_jobs/builder_venv.xml.erb"), builders => template("jenkins_jobs/builder_venv.xml.erb"),

16
modules/jenkins_jobs/manifests/job.pp
View File

@ -3,42 +3,34 @@ define jenkins_jobs::job($site, $project, $job, $triggers="", $builders, $publis
file { "/var/lib/jenkins/jobs/${project}-${job}": file { "/var/lib/jenkins/jobs/${project}-${job}":
ensure => directory, ensure => directory,
owner => 'jenkins', owner => 'jenkins',
group => 'nogroup'
} }
file { "/var/lib/jenkins/jobs/${project}-${job}/builds": file { "/var/lib/jenkins/jobs/${project}-${job}/builds":
ensure => directory, ensure => directory,
owner => 'jenkins', owner => 'jenkins',
group => 'nogroup', require => File["/var/lib/jenkins/jobs/${project}-${job}"]
require => File["/var/lib/jenkins/jobs/${project}-${job}"],
notify => Service["jenkins"]
} }
file { "/var/lib/jenkins/jobs/${project}-${job}/config-history": file { "/var/lib/jenkins/jobs/${project}-${job}/config-history":
ensure => directory, ensure => directory,
owner => 'jenkins', owner => 'jenkins',
group => 'nogroup', require => File["/var/lib/jenkins/jobs/${project}-${job}"]
require => File["/var/lib/jenkins/jobs/${project}-${job}"],
notify => Service["jenkins"]
} }
file { "/var/lib/jenkins/jobs/${project}-${job}/config.xml": file { "/var/lib/jenkins/jobs/${project}-${job}/config.xml":
ensure => present, ensure => present,
content => template("jenkins_jobs/body.xml.erb"), content => template("jenkins_jobs/body.xml.erb"),
owner => 'jenkins', owner => 'jenkins',
group => 'nogroup',
require => File["/var/lib/jenkins/jobs/${project}-${job}"], require => File["/var/lib/jenkins/jobs/${project}-${job}"],
notify => Service["jenkins"] notify => Service["jenkins"]
} }
file { "/var/lib/jenkins/jobs/${project}-${job}/nextBuildNumer": file { "/var/lib/jenkins/jobs/${project}-${job}/nextBuildNumber":
ensure => present, ensure => present,
content => "1", content => "1",
owner => 'jenkins', owner => 'jenkins',
group => 'nogroup',
replace => false, replace => false,
require => File["/var/lib/jenkins/jobs/${project}-${job}"], require => File["/var/lib/jenkins/jobs/${project}-${job}"]
notify => Service["jenkins"]
} }
} }

4
modules/jenkins_jobs/templates/body.xml.erb
View File

@ -50,10 +50,10 @@
<%= builders %> <%= builders %>
</builders> </builders>
<% end %> <% end %>
<% if publishers != "" %>
<publishers> <publishers>
<% if publishers != "" %>
<%= publishers %> <%= publishers %>
</publishers>
<% end %> <% end %>
</publishers>
<buildWrappers/> <buildWrappers/>
</project> </project>