Add no_proxy configuration.

voxpupuli · May 26, 2015 · 843495d · 843495d
1 parent 2343dc1
commit 843495d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -122,10 +122,14 @@
 
   if (empty(grep([ $::jenkins_plugins ], $search))) {
     if ($jenkins::proxy_host) {
+      unless empty($jenkins::no_proxy_list) {
+	      $no_proxy = join($jenkins::no_proxy_list, ',')
+      }
       Exec {
         environment => [
           "http_proxy=${jenkins::proxy_host}:${jenkins::proxy_port}",
-          "https_proxy=${jenkins::proxy_host}:${jenkins::proxy_port}"
+          "https_proxy=${jenkins::proxy_host}:${jenkins::proxy_port}",
+          "no_proxy=${no_proxy}"
         ]
       }
     }

diff --git a/spec/defines/jenkins_plugin_spec.rb b/spec/defines/jenkins_plugin_spec.rb
@@ -103,10 +103,45 @@
     ]}
 
     it do
+      should contain_exec('create-pinnedfile-myplug').with(
+        :environment => [
+          "http_proxy=proxy.company.com:8080",
+          "https_proxy=proxy.company.com:8080",
+          "no_proxy="
+        ]
+      )
+      should contain_exec('download-myplug').with(
+        :environment => [
+          "http_proxy=proxy.company.com:8080",
+          "https_proxy=proxy.company.com:8080",
+          "no_proxy="
+        ]
+      )
+    end
+  end
+
+  describe 'with proxy and no proxy' do
+    let(:pre_condition) { [
+      'class jenkins {
+        $proxy_host = "proxy.company.com"
+        $proxy_port = 8080
+        $no_proxy_list = ["noproxy.company.com", "also-noproxy.com"]
+      }',
+      'include jenkins'
+    ]}
+    it do
+      should contain_exec('create-pinnedfile-myplug').with(
+        :environment => [
+          "http_proxy=proxy.company.com:8080",
+          "https_proxy=proxy.company.com:8080",
+          "no_proxy=noproxy.company.com,also-noproxy.com"
+        ]
+      )
       should contain_exec('download-myplug').with(
         :environment => [
           "http_proxy=proxy.company.com:8080",
           "https_proxy=proxy.company.com:8080",
+          "no_proxy=noproxy.company.com,also-noproxy.com"
         ]
       )
     end