From 3f4a70d1a3c0e389bdd7241adfbeb4a236dde36c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sat, 3 Aug 2013 02:28:41 +0000 Subject: [PATCH] Don't automatically restart jenkins on plugin changes This way we can manually gracefully restart jenkins. Since this won't immediately install plugins, change the download test to check whether an hpi or jpi file exists. Change-Id: I41667684ad8a57f5ae554f866dcc38d5ecca6ba0 --- modules/jenkins/manifests/plugin.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/jenkins/manifests/plugin.pp b/modules/jenkins/manifests/plugin.pp index 2143a5fcbb..f1b5f303d6 100644 --- a/modules/jenkins/manifests/plugin.pp +++ b/modules/jenkins/manifests/plugin.pp @@ -49,7 +49,9 @@ define jenkins::plugin( require => File[$plugin_dir], path => ['/usr/bin', '/usr/sbin',], user => 'jenkins', - unless => "test -d ${plugin_dir}/${name}", - notify => Service['jenkins'], + unless => "test -f ${plugin_dir}/${name}.?pi", +# OpenStack modification: don't auto-restart jenkins so we can control +# outage timing better. +# notify => Service['jenkins'], } }