beaker-pe 2.11.7 → 2.11.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2729fa197d07e6977316382ea5621a152a0d740a19b1bd8639101867384eb15f
-  data.tar.gz: 434680a7743f98182d0a2261c5151b204bd1e0439cf4532ce249bdfb93e2ac14
+  metadata.gz: 0ea72482bc472e4a0559e8f1c451de554f2c35c1e88337280c1c5e79b8dbabf1
+  data.tar.gz: f07017a866d781a895481347ec738da1e42a1e07fc1d7aeed50945e7cc0f6a02
 SHA512:
-  metadata.gz: 024973babe90a837c4c86b3efecfe5792dc1610eae356a3e05abd54ecafb529640b616923aa674e51c125a4bd4405b67ab15dfaac82f391a9aa7a1cbafb5513c
-  data.tar.gz: 884e05b5a6a9e0c0a43420f5fa71bd5c805cc641d2b5cf5bcd3ff9eb2f359bd239c297d93e2405cad89bd06805430006d59666fb4903e9a44d78da9905f9341a
+  metadata.gz: 27d77ade9aabcc07859a6aa09e54ce9c7be605e527531dc58f5ed75c1119590de9a0e59aece829d6616db4d0a34cac7e83c5e207ac484d101ca1ce35008b7002
+  data.tar.gz: a782f6043fc83b976949c45899ef95914b41b74e5d2515458081c34e91b3cba84455278f24fa9d52c9bade9afa913fa04063c1d41f9ff04e08ed5d63b6e8846b

data/Gemfile

@@ -15,6 +15,7 @@ end
 group :acceptance_testing do
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
   gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1.3')
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.8')
 end
 
 gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 4.3')

data/README.md

@@ -70,10 +70,10 @@ you'd like to provide your own hosts file, set the `CONFIG` environment variable
 # Release
 
 To release new versions, we use a
-[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_master/)
+[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_main/)
 (access to internal infrastructure will be required to view job).
 
-To release a new version (from the master branch), you'll need to just provide
+To release a new version (from the main branch), you'll need to just provide
 a new beaker-pe version number to the job, and you're off to the races.
 
 # Questions

data/beaker-pe.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
   s.add_development_dependency 'rake', '~> 12.3.3'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'simplecov', '= 0.18.5'
   s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies

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

@@ -139,7 +139,7 @@ module Beaker
         #Return true if tlsv1 protocol needs to be enforced
         #param [Host] the host
         def require_tlsv1?(host)
-          tlsv1_platforms = [/aix/, /el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
+          tlsv1_platforms = [/el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
           return tlsv1_platforms.any? {|platform_regex| host['platform'] =~ platform_regex}
         end
 
@@ -184,6 +184,12 @@ module Beaker
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
           use_puppet_ca_cert = host[:use_puppet_ca_cert] || opts[:use_puppet_ca_cert]
 
+          # PE 2019.8.3 had a bug in the frictionless install of osx-10.14 and osx-10.15
+          # We need to do a bit of a hacky process to install the agent
+          if host['platform'] =~ /osx-10\.1(4|5)/ && (pe_version.eql?('2019.8.3') || pe_version.eql?('2019.8.4'))
+            return "curl -kO https://#{downloadhost}:8140/packages/current/#{host['platform']}.bash && bash #{host['platform']}.bash"
+          end
+
           if host['platform'] =~ /windows/ then
             if use_puppet_ca_cert
               frictionless_install_opts << '-UsePuppetCA'
@@ -205,7 +211,7 @@ module Beaker
             end
             if use_puppet_ca_cert
               curl_opts << '--cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem'
-            elsif host['platform'] !~ /aix/
+            else
               curl_opts << '-k'
             end
 
@@ -725,12 +731,16 @@ module Beaker
           hosts.each do |host|
             step "Configuring #{host} to use proxy" do
               @osmirror_host = "osmirror.delivery.puppetlabs.net"
+              puts "Grabbing IP for osmirror.delivery.puppetlabs.net"
               @osmirror_host_ip = IPSocket.getaddress(@osmirror_host)
               @delivery_host = "artifactory.delivery.puppetlabs.net"
+              puts "Grabbing IP for artifactory.delivery.puppetlabs.net"
               @delivery_host_ip = IPSocket.getaddress(@delivery_host)
               @test_forge_host = "api-forge-aio02-petest.puppet.com"
+              puts "Grabbing IP for api-forge-aio02-petest.puppet.com"
               @test_forge_host_ip = IPSocket.getaddress(@test_forge_host)
               @github_host = "github.com"
+              puts "Grabbing IP for github.com"
               @github_host_ip = IPSocket.getaddress(@github_host)
               @proxy_ip = @options[:proxy_ip]
               @proxy_hostname = @options[:proxy_hostname]
@@ -751,6 +761,9 @@ module Beaker
               on host, "iptables -A OUTPUT -p tcp -d #{@osmirror_host_ip} -j DROP"
               on host, "iptables -A OUTPUT -p tcp -d #{@delivery_host_ip} -j DROP"
               on host, "iptables -A OUTPUT -p tcp -d #{@test_forge_host_ip} -j DROP"
+              # The next two lines are for our production and test k8s test runners
+              on host, "iptables -A OUTPUT -p tcp -d 10.236.112.0/20 -j ACCEPT"
+              on host, "iptables -A OUTPUT -p tcp -d 10.220.0.0/16 -j ACCEPT"
               # The next two lines clear the rest of the internal puppet lan
               on host, "iptables -A OUTPUT -p tcp -d 10.16.0.0/16 -j ACCEPT"
               on host, "iptables -A OUTPUT -p tcp -d 10.32.0.0/16 -j ACCEPT"
@@ -1047,7 +1060,11 @@ module Beaker
           facts_result = on(master, 'puppet facts')
           raise ArgumentError, fail_message if facts_result.exit_code != 0
           facts_hash = JSON.parse(facts_result.stdout.chomp)
-          puppet_agent_version = facts_hash['values']['aio_agent_version']
+          # In Puppet 7, facts are at the top level of the hash. Before that
+          # version, they were wrapped inside a `values` key. Since we're
+          # trying to determine the agent version here, we can't just switch
+          # our behavior by agent version, so we check both possible locations.
+          puppet_agent_version = facts_hash['aio_agent_version'] || facts_hash.dig('values', 'aio_agent_version')
           raise ArgumentError, fail_message if puppet_agent_version.nil?
           logger.warn("#{log_prefix} Read puppet-agent version #{puppet_agent_version} from master")
           # saving so that we don't have to query the master more than once

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.7'
+        STRING = '2.11.12'
       end
 
     end

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

@@ -263,7 +263,7 @@ describe ClassMixedWithDSLInstallUtils do
       expecting = [
         "FRICTIONLESS_TRACE='true'",
         "export FRICTIONLESS_TRACE",
-        "cd /tmp && curl -O --tlsv1 https://testmaster:8140/packages/current/install.bash && bash install.bash"
+        "cd /tmp && curl -O --tlsv1 -k https://testmaster:8140/packages/current/install.bash && bash install.bash"
       ].join("; ")
 
       expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 2.11.12
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,16 +76,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement