Merge pull request #31 from tvpartytonight/pe_17658_update_gpg_key

(PE-17658) Update gpg key location
puppetlabs · Sep 29, 2016 · 60a293f · 60a293f
2 parents ac814a9 + 5824f76
commit 60a293f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/beaker-pe/install/pe_utils.rb b/lib/beaker-pe/install/pe_utils.rb
@@ -554,7 +554,7 @@ def add_extended_gpg_key_to_hosts(hosts, opts)
               host_ver = host['pe_ver'] || opts['pe_ver']
 
               if version_is_less(host_ver, '3.8.5') || (!version_is_less(host_ver, '2015.2.0') && version_is_less(host_ver, '2016.1.2'))
-                on(host, 'curl http://apt.puppetlabs.com/pubkey.gpg | apt-key add -')
+                on(host, 'curl http://apt.puppetlabs.com/DEB-GPG-KEY-puppetlabs | apt-key add -')
               end
             end
           end

diff --git a/spec/beaker-pe/install/pe_utils_spec.rb b/spec/beaker-pe/install/pe_utils_spec.rb
@@ -445,7 +445,7 @@ def slice_installer_options(host)
   end
 
   describe 'add_extended_gpg_key_to_hosts' do
-    let(:on_cmd) { 'curl http://apt.puppetlabs.com/pubkey.gpg | apt-key add -' }
+    let(:on_cmd) { 'curl http://apt.puppetlabs.com/DEB-GPG-KEY-puppetlabs | apt-key add -' }
     let(:deb_host) do
       host = hosts.first
       host['platform'] = 'debian'