From 1d65e2dc3ce23c925b06bf40bc127567d203d257 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 27 Jul 2012 09:35:05 -0700 Subject: [PATCH] Run jenkins jobs script only after config update. Previously the jenkins job script was run against Jenkins during each Puppet run. Now run the jenkins job script only if any of the job configs or jenkins job configs change. Change-Id: I12d6dcf56ae46de7b5f373f2e4df6214c0f59c79 --- modules/jenkins_jobs/manifests/init.pp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/jenkins_jobs/manifests/init.pp b/modules/jenkins_jobs/manifests/init.pp index 33c3b7a1ea..ba21c364e7 100644 --- a/modules/jenkins_jobs/manifests/init.pp +++ b/modules/jenkins_jobs/manifests/init.pp @@ -13,7 +13,8 @@ class jenkins_jobs($url, $username, $password, $site) { ensure => 'directory', recurse => true, source => ['puppet:///modules/jenkins_jobs/'], - require => Package['python-yaml'] + require => Package['python-yaml'], + notify => Exec["jenkins_job_${site}"] } file { '/usr/local/jenkins_jobs/jenkins_jobs.ini': @@ -23,13 +24,15 @@ class jenkins_jobs($url, $username, $password, $site) { ensure => 'present', content => template('jenkins_jobs/jenkins_jobs.ini.erb'), replace => 'true', - require => File['/usr/local/jenkins_jobs'] + require => File['/usr/local/jenkins_jobs'], + notify => Exec["jenkins_job_${site}"] } exec { "jenkins_job_${site}": command => "python /usr/local/jenkins_jobs/jenkins_jobs.py update /usr/local/jenkins_jobs/projects/${site}", cwd => '/usr/local/jenkins_jobs/', path => '/bin:/usr/bin', + refreshonly => true, require => [ File['/usr/local/jenkins_jobs/jenkins_jobs.ini'], Package['python-jenkins']