use https when downloading the war, for debian repos

Signed-off-by: John Morrissey <[email protected]>
sous-chefs · Jan 23, 2017 · 2776afc · 2776afc
1 parent e9516ea
commit 2776afc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -112,14 +112,14 @@ suites:
       jenkins:
         master:
           install_method: war
-          source: http://mirrors.jenkins-ci.org/war-stable/latest/jenkins.war
+          source: https://updates.jenkins.io/stable/latest/jenkins.war
   - name: smoke_war_latest
     run_list: jenkins_server_wrapper::default
     attributes:
       jenkins:
         master:
           install_method: war
-          source: http://mirrors.jenkins-ci.org/war/latest/jenkins.war
+          source: https://updates.jenkins.io/latest/jenkins.war
 
   #
   # Authentication suites

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -19,7 +19,7 @@ provisioner:
       master:
         host: localhost
         install_method: war
-        mirror: http://mirrors.jenkins-ci.org
+        mirror: https://updates.jenkins.io
 
 platforms:
   - name: ubuntu-14.04
@@ -43,14 +43,14 @@ suites:
       jenkins:
         master:
           install_method: war
-          source: http://mirrors.jenkins-ci.org/war-stable/latest/jenkins.war
+          source: https://updates.jenkins.io/stable/latest/jenkins.war
   - name: smoke_war_latest
     run_list: jenkins_server_wrapper::default
     attributes:
       jenkins:
         master:
           install_method: war
-          source: http://mirrors.jenkins-ci.org/war/latest/jenkins.war
+          source: https://updates.jenkins.io/latest/jenkins.war
 
   #
   # Authentication suites

diff --git a/attributes/master.rb b/attributes/master.rb
@@ -55,7 +55,7 @@
   # more interested in the +source+ attribute, which accepts the full path
   # to the war file for downloading.
   #
-  master['mirror'] = 'http://mirrors.jenkins-ci.org'
+  master['mirror'] = 'https://updates.jenkins.io'
 
   #
   # The full URL to the Jenkins WAR file on the remote mirror. This attribute is
@@ -70,7 +70,7 @@
   # Warning: Setting this attribute will negate/ignore any values for +mirror+
   # and +version+.
   #
-  master['source'] = "#{node['jenkins']['master']['mirror']}/war/#{node['jenkins']['master']['version'] || 'latest'}/jenkins.war"
+  master['source'] = "#{node['jenkins']['master']['mirror']}/#{node['jenkins']['master']['version'] || 'current'}/latest/jenkins.war"
 
   #
   # The checksum of the war file. This is use to verify that the remote war file
@@ -217,15 +217,15 @@
   # Repository URL. Default is latest
   #
   master['repository'] = case node['platform_family']
-                         when 'debian' then 'http://pkg.jenkins-ci.org/debian'
+                         when 'debian' then 'https://pkg.jenkins.io/debian'
                          when 'rhel' then 'https://pkg.jenkins.io/redhat'
                          end
 
   #
   # Repository key. Default is latest
   #
   master['repository_key'] = case node['platform_family']
-                             when 'debian' then 'http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key'
+                             when 'debian' then 'https://pkg.jenkins.io/debian/jenkins.io.key'
                              when 'rhel' then 'https://pkg.jenkins.io/redhat/jenkins.io.key'
                              end