Merge pull request #188 from Jimdo/fix-installation-of-core-plugins

Fix installation of core plugins
voxpupuli · Sep 26, 2014 · e5ab7b7 · e5ab7b7
2 parents 7493b9d + f8ddab1
commit e5ab7b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -92,7 +92,7 @@
     }
 
     exec { "download-${name}" :
-      command => "rm -rf ${name} ${name}.* && wget --no-check-certificate ${base_url}${plugin}",
+      command => "rm -rf ${name} ${name}.hpi ${name}.jpi && wget --no-check-certificate ${base_url}${plugin}",
       cwd     => $plugin_dir,
       require => [File[$plugin_dir], Package['wget']],
       path    => ['/usr/bin', '/usr/sbin', '/bin'],

diff --git a/spec/defines/jenkins_plugin_spec.rb b/spec/defines/jenkins_plugin_spec.rb
@@ -25,7 +25,7 @@
 
   describe 'without version' do
     it { should contain_exec('download-myplug').with(
-      :command      => 'rm -rf myplug myplug.* && wget --no-check-certificate http://updates.jenkins-ci.org/latest/myplug.hpi',
+      :command      => 'rm -rf myplug myplug.hpi myplug.jpi && wget --no-check-certificate http://updates.jenkins-ci.org/latest/myplug.hpi',
       :environment  => nil
     )}
     it { should contain_file('/var/lib/jenkins/plugins/myplug.hpi')}