beaker-pe 1.8.1 → 1.8.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZTZmYWJlMDhjOWFmNTkyNGJhODBhY2QyMGQ3Y2M4YjAzNDVlN2UwNQ==
4
+ MzRjNmZhOThhNGRhMGViOTQ0OGIzZTcyZjMxNDg5NGI3MTNhNWI0MQ==
5
5
  data.tar.gz: !binary |-
6
- ZTE2NjhlNWYxNTY5Y2VmYjQwZGRjMDMyNzNkOGZjMTE3ZDU3ZGQ2MA==
6
+ YTRjZTBlZGU0MjgzZTc2ODhhY2JlMWIxMjMwNjRkZmQzN2Q3MDczMQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NmMyMGI4YWM3NjBkNDlhZDZmYWQ0MTkxNmE3ODA3MjI1ZTFmODE2MmJmMzJl
10
- MjZjYzAyYjY3ZGYyYWQ4NzQ5MGMyOThkYmMwZDc2YWY3YzEzYTM0OWRmMmQ3
11
- NGJmMzhhODViY2U0YTdlODdiODFiNTBjZTIxNmEwYmFjODE4Yzk=
9
+ M2ExNTJjNTNjZWY0ZDc0MmQ1NTcwMjkxYzliNTBkN2VhZGIyNzBlMDRjMjZh
10
+ OGM0OWVmMGJlMmI2ODZhZjg3N2U4OTE5ZmZlZjcyNmZiNDYwZDg3ZDcyMjJk
11
+ MjU4YTg5OTZkMzQwNTdlNzZlZmQwMjczYzE4ODlkYTU3MjBhNjc=
12
12
  data.tar.gz: !binary |-
13
- OGJmOWU0NGVkMmZlYTdhZjYwNGIzNzA0NGMyOTY5Y2NjODg1YjYxOWFlYWQw
14
- NGMzMjQyNmFmNzQzYWJjNDAzNDE3YmE3NTVhZDk5NjQ2MTk4M2QwZGMzY2Q1
15
- YmRmMTMzMTI0MDhiZTMwZmZiMGU3Njg2YzE0ZDQzNzMxZWQyOGY=
13
+ ZWUxNWVkZjk4N2ZkZmIzYjJmY2I0MGYwMzI4ZTJlNDMyYjg5ZGJlMTY3Zjcy
14
+ NTBiYmY1N2ViMDRkOGMyNmRhODVlNDZkMDQwODZjMTU4OTQzMzc2ODNjZGZi
15
+ MzdkYThkZjUxMTA1N2UxOTM1OTUwMGQwMGM0NGM5OWQ0ZmVlZDc=
data/HISTORY.md CHANGED
@@ -1,6 +1,7 @@
1
1
  # default - History
2
2
  ## Tags
3
- * [LATEST - 30 Dec, 2016 (7a9c2c4a)](#LATEST)
3
+ * [LATEST - 6 Jan, 2017 (93ef8841)](#LATEST)
4
+ * [1.8.1 - 30 Dec, 2016 (3cefad28)](#1.8.1)
4
5
  * [1.8.0 - 30 Dec, 2016 (5a37fef7)](#1.8.0)
5
6
  * [1.7.0 - 20 Dec, 2016 (99e6bbde)](#1.7.0)
6
7
  * [1.6.1 - 22 Nov, 2016 (52e30609)](#1.6.1)
@@ -28,7 +29,27 @@
28
29
  * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
29
30
 
30
31
  ## Details
31
- ### <a name = "LATEST">LATEST - 30 Dec, 2016 (7a9c2c4a)
32
+ ### <a name = "LATEST">LATEST - 6 Jan, 2017 (93ef8841)
33
+
34
+ * (GEM) update beaker-pe version to 1.8.2 (93ef8841)
35
+
36
+ * PE-19086 Change extend gpg key to ignore gpg key warnings (#47) (45d907e6)
37
+
38
+
39
+ ```
40
+ PE-19086 Change extend gpg key to ignore gpg key warnings (#47)
41
+
42
+ The extended GPG-key for PE 2015.2 -> 2016.1.2 has expired.
43
+ Rather then continue to update it every few months, lets just
44
+ enable the older versions of PE that are installed on debian
45
+ systems to ignore gpg-key warnings.
46
+ We will still have testing coverage of the gpg-key on debian
47
+ systems via fresh installs of PE and testing upgrades from
48
+ PE 2016.2.0 and newer.
49
+ ```
50
+ ### <a name = "1.8.1">1.8.1 - 30 Dec, 2016 (3cefad28)
51
+
52
+ * (HISTORY) update beaker-pe history for gem release 1.8.1 (3cefad28)
32
53
 
33
54
  * (GEM) update beaker-pe version to 1.8.1 (7a9c2c4a)
34
55
 
@@ -380,10 +380,10 @@ module Beaker
380
380
  hosts_agent_only, hosts_not_agent_only = [], hosts.dup
381
381
  end
382
382
 
383
- # On July 8th, 2016, the GPG key used to sign repos inside PE tarballs
384
- # expired. Add a temporary, extended key to the host first so that it
385
- # can still install those old PE tarballs.
386
- add_extended_gpg_key_to_hosts(hosts, opts)
383
+ # On January 5th, 2017, the extended GPG key has expired. Rather then
384
+ # every few months updating this gem to point to a new key for PE versions
385
+ # less then PE 2016.4.0 we are going to just ignore the warning when installing
386
+ ignore_gpg_key_warning_on_hosts(hosts, opts)
387
387
 
388
388
  # Set PE distribution for all the hosts, create working dir
389
389
  prepare_hosts(hosts_not_agent_only, opts)
@@ -620,21 +620,17 @@ module Beaker
620
620
  (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.4.0') && !version_is_less(host['pe_ver'], '3.99'))) || (host['platform'] =~ /windows-2008r2/ && (version_is_less(host['pe_ver'], '2016.4.3') && !version_is_less(host['pe_ver'], '3.99')))
621
621
  end
622
622
 
623
- # On July 8th, 2016, the gpg key that was shipped and used to sign repos in
624
- # PE tarballs expired. This affects all PE version earlier then 3.8.5, and
625
- # versions between 2015.2 to 2016.1.2.
626
- #
627
- # PE 3.8.5 and 2016.1.2 shipped with a version of the key that had it's
628
- # expiration date extended by 6 months (to Janurary 2017).
629
- def add_extended_gpg_key_to_hosts(hosts, opts)
623
+ # For PE 3.8.5 to PE 2016.1.2 they have an expired gpg key. This method is
624
+ # for deb nodes to ignore the gpg-key expiration warning
625
+ def ignore_gpg_key_warning_on_hosts(hosts, opts)
630
626
  hosts.each do |host|
631
627
  # RPM based platforms do not seem to be effected by an expired GPG key,
632
628
  # while deb based platforms are failing.
633
629
  if host['platform'] =~ /debian|ubuntu/
634
630
  host_ver = host['pe_ver'] || opts['pe_ver']
635
631
 
636
- 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'))
637
- on(host, 'curl http://apt.puppetlabs.com/DEB-GPG-KEY-puppetlabs | apt-key add -')
632
+ if version_is_less(host_ver, '3.8.7') || (!version_is_less(host_ver, '2015.2.0') && version_is_less(host_ver, '2016.4.0'))
633
+ on(host, "echo 'APT { Get { AllowUnauthenticated \"1\"; }; };' >> /etc/apt/apt.conf")
638
634
  end
639
635
  end
640
636
  end
@@ -3,7 +3,7 @@ module Beaker
3
3
  module PE
4
4
 
5
5
  module Version
6
- STRING = '1.8.1'
6
+ STRING = '1.8.2'
7
7
  end
8
8
 
9
9
  end
@@ -476,8 +476,8 @@ describe ClassMixedWithDSLInstallUtils do
476
476
  end
477
477
  end
478
478
 
479
- describe 'add_extended_gpg_key_to_hosts' do
480
- let(:on_cmd) { 'curl http://apt.puppetlabs.com/DEB-GPG-KEY-puppetlabs | apt-key add -' }
479
+ describe 'ignore_gpg_key_warning_on_hosts' do
480
+ let(:on_cmd) { "echo 'APT { Get { AllowUnauthenticated \"1\"; }; };' >> /etc/apt/apt.conf" }
481
481
  let(:deb_host) do
482
482
  host = hosts.first
483
483
  host['platform'] = 'debian'
@@ -493,57 +493,57 @@ describe ClassMixedWithDSLInstallUtils do
493
493
 
494
494
  it 'does nothing on el platforms' do
495
495
  expect(subject).not_to receive(:on).with(hosts[0], on_cmd)
496
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
496
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
497
497
  end
498
498
 
499
- it 'installs key on debian based platforms' do
499
+ it 'adds in apt ignore gpg-key warning' do
500
500
  expect(subject).to receive(:on).with(hosts[1], on_cmd)
501
501
  expect(subject).to receive(:on).with(hosts[2], on_cmd)
502
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
502
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
503
503
  end
504
504
  end
505
505
 
506
506
  context 'mixed pe_versions' do
507
507
  before(:each) do
508
508
  hosts[0]['platform'] = 'debian'
509
- hosts[0]['pe_ver'] = '2016.2.0'
509
+ hosts[0]['pe_ver'] = '2016.4.0'
510
510
  hosts[1]['platform'] = 'debian'
511
511
  hosts[1]['pe_ver'] = '3.8.4'
512
512
  end
513
513
 
514
- it 'adds key to required hosts' do
514
+ it 'adds apt gpg-key ignore to required hosts' do
515
515
  expect(subject).not_to receive(:on).with(hosts[0], on_cmd)
516
516
  expect(subject).to receive(:on).with(hosts[1], on_cmd)
517
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
517
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
518
518
  end
519
519
  end
520
520
 
521
- context 'PE versions earlier than 3.8.5' do
522
- ['3.3.2', '3.7.3', '3.8.2'].each do |pe_ver|
523
- it "Adds key on PE #{pe_ver}" do
521
+ context 'PE versions earlier than 3.8.7' do
522
+ ['3.3.2', '3.7.3', '3.8.2', '3.8.4', '3.8.5', '3.8.6'].each do |pe_ver|
523
+ it "Adds apt gpg-key ignore on PE #{pe_ver}" do
524
524
  deb_host['pe_ver'] = pe_ver
525
525
  expect(subject).to receive(:on).with(deb_host, on_cmd)
526
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
526
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
527
527
  end
528
528
  end
529
529
  end
530
530
 
531
- context 'PE versions between 2015.2.0 and 2016.1.1' do
532
- ['2015.2.0', '2015.3.1', '2016.1.1'].each do |pe_ver|
533
- it "Adds key on PE #{pe_ver}" do
531
+ context 'PE versions between 2015.2.0 and 2016.2.1' do
532
+ ['2015.2.0', '2015.3.1', '2016.1.2', '2016.2.1'].each do |pe_ver|
533
+ it "Adds apt gpg-key ignore on PE #{pe_ver}" do
534
534
  deb_host['pe_ver'] = pe_ver
535
535
  expect(subject).to receive(:on).with(deb_host, on_cmd)
536
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
536
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
537
537
  end
538
538
  end
539
539
  end
540
540
 
541
- ['3.8.5', '3.8.6', '2016.1.2', '2016.2.0'].each do |pe_ver|
541
+ ['2016.4.0', '2016.5.1', '2017.1.0'].each do |pe_ver|
542
542
  context "PE #{pe_ver}" do
543
543
  it 'does nothing' do
544
544
  deb_host['pe_ver'] = pe_ver
545
545
  expect(subject).not_to receive(:on).with(deb_host, on_cmd)
546
- subject.add_extended_gpg_key_to_hosts(hosts, opts)
546
+ subject.ignore_gpg_key_warning_on_hosts(hosts, opts)
547
547
  end
548
548
  end
549
549
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-pe
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.1
4
+ version: 1.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-12-30 00:00:00.000000000 Z
11
+ date: 2017-01-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec