beaker-pe 2.11.6 → 2.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e607f0adbf9ab049934cd0ce8b147e60e63fe642aa2cb78cbb92db28c72dc97b
-  data.tar.gz: 3f51752866e156e61b75d9fbca4f1d00cc916f68f7c197fd089d1cc5069649d0
+  metadata.gz: a601533eb75af4da03d301dbe3649a12f5123dc1ed962e9aeedd76069563bf51
+  data.tar.gz: 2b530fbdf6d59a6743576e4c7c4820c28d193d7dcf9cc403a5fcbe1929e21fc5
 SHA512:
-  metadata.gz: 337a4164bcc7d6a5e73e515ee4b277a11b1a08524cda7158226303a229b962e4a65072aa2b51e968658580c8784c8f9ae25940e79c31e863c94b414a6096438a
-  data.tar.gz: 81e2989aa75682be94555e98273ce477d71384bdaa55ccbcc3a12d42030d512b6ed3382e04e0aa1d12fc447cd5c0e23f4b7a1dd4da67a1bbdabacc15da6606e7
+  metadata.gz: f340e1fa5d7e7e3a495a2505ee207f4f69d2a67df84ff698bd57bf9dae0213d3b52ee7b6daa30449b5e9e0720f541029276cad4618a249b714eb548aaf587cfc
+  data.tar.gz: aea775bc25fc35d26ab14d471818c50acb52a6f27557c4f1fd31214568d8bee1fd4981e0ba68e6a398c965063a8698c49b3a20eaa52ffa98892c4f2c9a76e673

data/CODEOWNERS

@@ -1,4 +1,5 @@
-#This Repository is maintained by both the beaker and installer teams, depending on the location of the changes
+#This Repository is maintained by both the beaker, installer, and Night's Watch teams, depending on the location of the changes
 * @puppetlabs/beaker
 /lib/beaker-pe/install @puppetlabs/installer-and-management
+/lib/beaker-pe/pe-client-tools @puppetlabs/night-s-watch
 /spec/beaker-pe/install @puppetlabs/installer-and-management

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

@@ -6,7 +6,6 @@ require "beaker-answers"
 require "timeout"
 require "json"
 require "deep_merge"
-
 module Beaker
   module DSL
     module InstallUtils
@@ -185,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'
@@ -582,6 +587,8 @@ module Beaker
             do_install_pe_with_pe_managed_external_postgres(hosts,opts)
           when :simple_monolithic
             simple_monolithic_install(hosts.first, hosts.drop(1), opts)
+          when :simple_monolithic_install_with_preload
+            simple_monolithic_install_with_preload(hosts.first, hosts.drop(1), opts)
           when :simple_split
             # This isn't implemented yet, so just do a generic install instead
             #simple_split_install(hosts, opts)
@@ -628,7 +635,11 @@ module Beaker
 
           mono_roles = ['master', 'database', 'dashboard']
           if has_all_roles?(hosts.first, mono_roles) && hosts.drop(1).all? {|host| host['roles'].include?('frictionless')}
-            :simple_monolithic
+            if hosts.first['template'] =~ /-preload/ && opts[:type] != :upgrade
+              :simple_monolithic_install_with_preload
+            else
+              :simple_monolithic
+            end
           elsif hosts[0]['roles'].include?('master') && hosts[1]['roles'].include?('database') && hosts[2]['roles'].include?('dashboard') && hosts.drop(3).all? {|host| host['roles'].include?('frictionless')}
             :simple_split
           elsif hosts.any? {|host| host['roles'].include?('pe_postgres')}
@@ -661,7 +672,7 @@ module Beaker
           register_feature_flags!(opts)
           generate_installer_conf_file_for(master, all_hosts, opts)
           step "Install PE on master" do
-            on master, installer_cmd(master, opts) if master['template'] !~ /-preload/
+            on master, installer_cmd(master, opts)
           end
 
           step "Stop agent on master" do
@@ -683,18 +694,53 @@ module Beaker
           end
         end
 
+        # Configure PE on a monolithic master and some number of frictionless agents if a node is using a PE preloaded image for the master node.
+        # @param [Host] master The node to configure the master on
+        # @param [Array<Host>] agents The nodes to install agents on
+        # @param [Hash{Symbol=>Symbol, String}] opts The options for how to install or upgrade PE
+        #
+        # @example
+        #   simple_monolithic_install_with_preload(master, agents, {:type => :install, :pe_ver => '2017.2.0'})
+        #
+        # @return nil
+        #
+        # @api private
+        def simple_monolithic_install_with_preload(master, agents, opts={})
+          step "Performing a standard monolithic install with frictionless agents on a preloaded image"
+          all_hosts = [master, *agents]
+          configure_type_defaults_on([master])
+
+          # Set PE distribution on the agents, creates working directories
+          prepare_hosts(all_hosts, opts)
+          register_feature_flags!(opts)
+          generate_installer_conf_file_for(master, all_hosts, opts)
+
+          step "Stop agent on master" do
+            stop_agent_on(master)
+          end
+
+          if manage_puppet_service?(master[:pe_ver], options)
+            configure_puppet_agent_service(:ensure => 'stopped', :enabled => false)
+          end
+
+          install_agents_only_on(agents, opts)
+        end
 
         # Configure the master to use a proxy and drop unproxied connections
         def config_hosts_for_proxy_access hosts
           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]
@@ -715,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"
@@ -1011,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.6'
+        STRING = '2.11.11'
       end
 
     end

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

@@ -1621,6 +1621,13 @@ describe ClassMixedWithDSLInstallUtils do
       subject.do_install([])
     end
 
+    it 'chooses to do a simple monolithic install with preload when appropriate' do
+      expect(subject).to receive(:simple_monolithic_install_with_preload)
+      allow(subject).to receive(:determine_install_type).and_return(:simple_monolithic_install_with_preload)
+
+      subject.do_install([])
+    end
+
     it 'can perform a simple installation' do
       expect(subject).to receive(:get_mco_setting).and_return({})
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 2.11.11
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-01-25 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