Merge pull request #898 from bastelfreak/puppet5

fix unreferenced variables; add puppet5/6 support

Author: alexjfisher

manifests/cli.pp

@@ -40,7 +40,6 @@
     path        => ['/bin', '/usr/bin'],
     cwd         => '/tmp',
     refreshonly => true,
-    require     => Class['::jenkins::service'],
   }
   # Extract latest CLI in case package is updated / downgraded
   Package[$::jenkins::package_name] ~> Exec['jenkins-cli']

manifests/job/present.pp

@@ -58,6 +58,7 @@
     file { $tmp_config_path:
       content => $d,
       require => Exec['jenkins-cli'],
+      before  => Exec["jenkins create-job ${jobname}"],
     }
   }
 
@@ -81,7 +82,6 @@
   exec { "jenkins create-job ${jobname}":
     command => "${cat_config} | ${create_job}",
     creates => [$config_path, "${job_dir}/builds"],
-    require => File[$tmp_config_path],
   }
 
   if $replace {
@@ -91,7 +91,6 @@
       command => "${cat_config} | ${update_job}",
       onlyif  => "test -e ${config_path}",
       unless  => "${difftool} ${config_path} ${tmp_config_path}",
-      require => File[$tmp_config_path],
       notify  => Exec['reload-jenkins'],
     }
   }

manifests/plugin.pp

@@ -35,6 +35,20 @@
   Any $create_user                  = undef,
 ) {
 
+  include jenkins
+
+  if $jenkins::manage_service {
+    $notify = Class['jenkins::service']
+  } else {
+    $notify = undef
+  }
+
+  if $jenkins::manage_datadirs {
+    $plugindir = File[$jenkins::plugin_dir]
+  } else {
+    $plugindir = undef
+  }
+
   if $timeout {
     warning('jenkins::plugin::timeout presently has effect')
   }
@@ -138,7 +152,7 @@
       group   => $::jenkins::group,
       mode    => '0644',
       require => Archive[$plugin],
-      notify  => Class['::jenkins::service'],
+      notify  => $notify,
     }
 
     $pinned_ensure = $pin ? {
@@ -151,7 +165,7 @@
       owner   => $::jenkins::user,
       group   => $::jenkins::group,
       require => Archive[$plugin],
-      notify  => Class['::jenkins::service'],
+      notify  => $notify,
     }
 
     if $digest_string {
@@ -176,8 +190,8 @@
       proxy_server    => $::jenkins::proxy::url,
       cleanup         => false,
       extract         => false,
-      require         => File[$::jenkins::plugin_dir],
-      notify          => Class['::jenkins::service'],
+      require         => $plugindir,
+      notify          => $notify,
     }
     $archive_require = Archive[$plugin]
   } else {
@@ -189,7 +203,7 @@
     group   => $::jenkins::group,
     mode    => '0644',
     require => $archive_require,
-    before  => Class['::jenkins::service'],
+    before  => $notify,
   }
 
   if $manage_config {

manifests/sysconfig.pp

@@ -8,11 +8,15 @@
     warning("Jenkins::Sysconfig[${name}]: detected \'\$\' in value -- be advised the variable interpolation will not work under systemd")
   }
 
+  if $jenkins::manage_service {
+    $notify = Class['::jenkins::service']
+  } else {
+    $notify = undef
+  }
   file_line { "Jenkins sysconfig setting ${name}":
     path   => "${::jenkins::sysconfdir}/jenkins",
     line   => "${name}=\"${value}\"",
     match  => "^${name}=",
-    notify => Class['::jenkins::service'],
+    notify => $notify,
   }
-
 }

spec/classes/jenkins_master_spec.rb

@@ -11,6 +11,9 @@
   end
 
   let(:params) { { version: '1.2.3' } }
+  let :pre_condition do
+    'include jenkins'
+  end
 
   it { is_expected.to contain_jenkins__plugin('swarm').with_version('1.2.3') }
 end

spec/defines/jenkins_job_present_spec.rb

@@ -33,7 +33,7 @@
     let(:config_file) { File.expand_path(File.dirname(__FILE__) + '/../fixtures/testjob.xml') }
     let(:params) { { config_file: config_file } }
 
-    it { is_expected.to contain_exec('jenkins create-job myjob').with_require('File[' + config_file + ']') }
+    it { is_expected.to contain_exec('jenkins create-job myjob') }
     it { is_expected.to contain_exec('jenkins update-job myjob') }
     it { is_expected.not_to contain_exec('jenkins delete-job myjob') }
   end