beaker-pe 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFkZTk0ODM1OWJkODQyM2M0NDVkNTA2MWIxN2FlYjU5MWI3MjRjMg==
+    OTEwNTk1YmQyODUyN2JkYzVmYzAzN2U2OGE5NDUwMWY4ZWIwODc4MQ==
   data.tar.gz: !binary |-
-    NDNlMmY2MDBiZjMxNjE0NTUzZTI3YzBiZmJlNjA0OTRlYjAxMzQxYw==
+    NGZmNjljOThhNGU1MjAwZDk0MGZmYzZkZWE1YzBkNjFlZmNmMTBmMA==
 SHA512:
   metadata.gz: !binary |-
-    YjcwOTkwYTE2ZTIxNzdmZWVmM2JkODM3MzhmMzlmYTIzZWEwMTNhMmYxMDAz
-    YTdkMmIzZTBmN2YyMTI1ZWJmMDkyYWQwN2NlMjQ0NTAyODZmMzEzODJkOTEz
-    YWVhN2YwNmYzNzRjNWY3OGE0OTI0YjNlZGJiMWQyYTg4MDliZDc=
+    MDI1Y2FlNjQyOThhZjNmNDVjNjQxZjg4MDJmMmRkOTc0MjZmNjgxOWU0MTQ4
+    MTk2YzQ5ZThlNDNjMGM5MjMwMzA2NWJlYmY3MjVlNTE0NGIwYzBjMzE4MzEy
+    ZWUwODBiODk3NTVjYzJiZDEwNDQ1ZjZmYTk3NjBlY2EzNTk3OWQ=
   data.tar.gz: !binary |-
-    MWIxN2ZmZTc2NDE3MTE5NWNmMTY2OWRhYTUyZjcxZTRhZjNiNjU1NDZjMjcw
-    OTlhYmMyNWRiOWY5NDc5YTUyYzgxMDFlM2MyOWU3MDNlYzgxZTNlMjhkNmMw
-    NGI2MTRlMjc2MDAzY2YwN2E1MDBlNzQzMTMzMDI3MjRlNjllMjE=
+    YzJiNDQwZTY5YTdkMmZmYTU5MTg3MWI5NGJhZjZhNGE0MzJkOGMwZTUxYjk0
+    MWQ3MzY0NmQ4MzYyMDc4OTFkYTk2YjlhZDIwYjk4Yjc1MzZhYWYzNjUwNWY1
+    MWRhZTFhM2ExNjVlMzJmNmIyMDc0NTMwMmI2YTg0OTQwMzdhYzI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 15 Jun, 2016 (985fe231)](#LATEST)
+* [LATEST - 11 Jul, 2016 (48b663eb)](#LATEST)
+* [0.5.0 - 15 Jun, 2016 (8f2874fe)](#0.5.0)
 * [0.4.0 - 1 Jun, 2016 (f5ad1884)](#0.4.0)
 * [0.3.0 - 26 May, 2016 (0d6b6d4c)](#0.3.0)
 * [0.2.0 - 18 May, 2016 (a65f2083)](#0.2.0)
@@ -9,7 +10,39 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 15 Jun, 2016 (985fe231)
+### <a name = "LATEST">LATEST - 11 Jul, 2016 (48b663eb)
+
+* (GEM) update beaker-pe version to 0.6.0 (48b663eb)
+
+* Merge pull request #14 from ericwilliamson/task/master/PE-16566-download-gpg-key (99c5008f)
+
+
+```
+Merge pull request #14 from ericwilliamson/task/master/PE-16566-download-gpg-key
+
+(PE-16566) Add method to download life support gpg key
+```
+* (PE-16566) Add method to download life support gpg key (df1f14bf)
+
+
+```
+(PE-16566) Add method to download life support gpg key
+
+As of July 8th, 2016 the GPG key that was shipped with and used to sign
+repos inside of PE tarballs expired. A new life support key was created
+that extended the expiration date to Jan 2017. That key shipped with PE
+3.8.5 and 2016.1.2.
+
+apt based platforms appear to be the only package manager failing due to
+an expired key, while rpm is fine.
+
+This commit adds a new helper method to additionally download and
+install the extended key for PE versions that have already been released
+and are needing to be tested.
+```
+### <a name = "0.5.0">0.5.0 - 15 Jun, 2016 (8f2874fe)
+
+* (HISTORY) update beaker-pe history for gem release 0.5.0 (8f2874fe)
 
 * (GEM) update beaker-pe version to 0.5.0 (985fe231)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -352,6 +352,11 @@ module Beaker
             hosts_agent_only, hosts_not_agent_only = [], hosts.dup
           end
 
+          # On July 8th, 2016, the GPG key used to sign repos inside PE tarballs
+          # expired. Add a temporary, extended key to the host first so that it
+          # can still install those old PE tarballs.
+          add_extended_gpg_key_to_hosts(hosts, opts)
+
           # Set PE distribution for all the hosts, create working dir
           use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
           hosts.each do |host|
@@ -516,6 +521,26 @@ module Beaker
           !version_is_less(version, MEEP_CUTOVER_VERSION)
         end
 
+        # On July 8th, 2016, the gpg key that was shipped and used to sign repos in
+        # PE tarballs expired. This affects all PE version earlier then 3.8.5, and
+        # versions between 2015.2 to 2016.1.2.
+        #
+        # PE 3.8.5 and 2016.1.2 shipped with a version of the key that had it's
+        # expiration date extended by 6 months (to Janurary 2017).
+        def add_extended_gpg_key_to_hosts(hosts, opts)
+          hosts.each do |host|
+            # RPM based platforms do not seem to be effected by an expired GPG key,
+            # while deb based platforms are failing.
+            if host['platform'] =~ /debian|ubuntu/
+              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 -')
+              end
+            end
+          end
+        end
+
         # Set installer options on the passed *host* according to current
         # version.
         #

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.5.0'
+        STRING = '0.6.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -444,6 +444,79 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'add_extended_gpg_key_to_hosts' do
+    let(:on_cmd) { 'curl http://apt.puppetlabs.com/pubkey.gpg | apt-key add -' }
+    let(:deb_host) do
+      host = hosts.first
+      host['platform'] = 'debian'
+      host
+    end
+
+    context 'mixed platforms' do
+      before(:each) do
+        hosts[0]['platform'] = 'centos'
+        hosts[1]['platform'] = 'debian'
+        hosts[2]['platform'] = 'ubuntu'
+      end
+
+      it 'does nothing on el platforms' do
+        expect(subject).not_to receive(:on).with(hosts[0], on_cmd)
+        subject.add_extended_gpg_key_to_hosts(hosts, opts)
+      end
+
+      it 'installs key on debian based platforms' do
+        expect(subject).to receive(:on).with(hosts[1], on_cmd)
+        expect(subject).to receive(:on).with(hosts[2], on_cmd)
+        subject.add_extended_gpg_key_to_hosts(hosts, opts)
+      end
+    end
+
+    context 'mixed pe_versions' do
+      before(:each) do
+        hosts[0]['platform'] = 'debian'
+        hosts[0]['pe_ver'] = '2016.2.0'
+        hosts[1]['platform'] = 'debian'
+        hosts[1]['pe_ver'] = '3.8.4'
+      end
+
+      it 'adds key to required hosts' do
+        expect(subject).not_to receive(:on).with(hosts[0], on_cmd)
+        expect(subject).to receive(:on).with(hosts[1], on_cmd)
+        subject.add_extended_gpg_key_to_hosts(hosts, opts)
+      end
+    end
+
+    context 'PE versions earlier than 3.8.5' do
+      ['3.3.2', '3.7.3', '3.8.2'].each do |pe_ver|
+        it "Adds key on PE #{pe_ver}" do
+          deb_host['pe_ver'] = pe_ver
+          expect(subject).to receive(:on).with(deb_host, on_cmd)
+          subject.add_extended_gpg_key_to_hosts(hosts, opts)
+        end
+      end
+    end
+
+    context 'PE versions between 2015.2.0 and 2016.1.1' do
+      ['2015.2.0', '2015.3.1', '2016.1.1'].each do |pe_ver|
+        it "Adds key on PE #{pe_ver}" do
+          deb_host['pe_ver'] = pe_ver
+          expect(subject).to receive(:on).with(deb_host, on_cmd)
+          subject.add_extended_gpg_key_to_hosts(hosts, opts)
+        end
+      end
+    end
+
+    ['3.8.5', '3.8.6', '2016.1.2', '2016.2.0'].each do |pe_ver|
+      context "PE #{pe_ver}" do
+        it 'does nothing' do
+          deb_host['pe_ver'] = pe_ver
+          expect(subject).not_to receive(:on).with(deb_host, on_cmd)
+          subject.add_extended_gpg_key_to_hosts(hosts, opts)
+        end
+      end
+    end
+  end
+
   describe 'fetch_pe' do
 
     it 'can push a local PE .tar.gz to a host and unpack it' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec