beaker-pe 2.11.2 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 622a9132221da31a9fd6e3aacb43b0cf59c66de74b0f820e7dbe47755d2c95fc
-  data.tar.gz: ee49a134484538884b674e8ea8647cfafc415434f0cc09a90fd049ca207c0d2a
+  metadata.gz: 2729fa197d07e6977316382ea5621a152a0d740a19b1bd8639101867384eb15f
+  data.tar.gz: 434680a7743f98182d0a2261c5151b204bd1e0439cf4532ce249bdfb93e2ac14
 SHA512:
-  metadata.gz: 05406e9cab8f69de5e71b44bf0962e2302f40b8cad21e35beaee365bb5a300fd129368f074d8a4957c0b50caa0d971d5cc2608b479fa9e275fb29df5dc1741ff
-  data.tar.gz: fb9bd2b9a116519fead1ad2209da9bd5c152d1146aacc4f1f53c00774d29eb595dcf83c75625c0267ab16b9610ec7be1792b128a9a4de71998963cc6205c0ff7
+  metadata.gz: 024973babe90a837c4c86b3efecfe5792dc1610eae356a3e05abd54ecafb529640b616923aa674e51c125a4bd4405b67ab15dfaac82f391a9aa7a1cbafb5513c
+  data.tar.gz: 884e05b5a6a9e0c0a43420f5fa71bd5c805cc641d2b5cf5bcd3ff9eb2f359bd239c297d93e2405cad89bd06805430006d59666fb4903e9a44d78da9905f9341a

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

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/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
@@ -292,7 +291,7 @@ module Beaker
               fetch_and_push_pe(host, path, filename, extension)
             else
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             end
           end
         end
@@ -328,7 +327,7 @@ module Beaker
               on host, "cd #{host['working_dir']}; chmod 644 #{filename}#{extension}"
             elsif host.is_cygwin?
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             else
               on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
             end
@@ -381,7 +380,7 @@ module Beaker
                 command_file_push = 'cat '
               else
                 curlopts = opts[:use_proxy] ? "--proxy #{opts[:proxy_hostname]}:3128 " : ""
-                command_file_push = "curl #{curlopts}#{path}/"
+                command_file_push = "curl -L #{curlopts}#{path}/"
               end
               on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
 
@@ -582,6 +581,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 +629,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')}
@@ -683,6 +688,37 @@ 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

data/lib/beaker-pe/pe-client-tools/executable_helper.rb

@@ -127,6 +127,7 @@ module Beaker
               #TODO does this need to be more detailed to pass exit codes????
               # TODO make batch file direct output to separate file
               batch_contents =<<-EOS
+@echo off
 call #{tool_executable} #{args.join(' ')}
               EOS
 

data/lib/beaker-pe/pe-client-tools/install_helper.rb

@@ -47,6 +47,15 @@ module Beaker
               else
                 install_dev_repos_on(product, host, directory, '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
                 host.install_package('pe-client-tools')
+                if host['platform'] =~ /cisco|centos|redhat|eos|sles|el-|fedora-(2[2-9]|3[0-9])/
+                  host.exec(Command.new('rpm -q pe-client-tools')) do |command|
+                    raise "Wanted version not installed." unless command.stdout =~ /-#{opts[:pe_client_tools_version]}/
+                  end
+                elsif host['platform'] =~ /ubuntu|debian|cumulus|huaweios/
+                  host.exec(Command.new("apt-cache policy pe-client-tools | sed -n -e 's/Installed: //p'")) do |command|
+                    raise "Wanted version not installed." unless command.stdout =~ /-#{opts[:pe_client_tools_version]}/
+                  end
+                end
             end
           end
         end

data/lib/beaker-pe/version.rb

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

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

@@ -646,29 +646,6 @@ describe ClassMixedWithDSLInstallUtils do
     def slice_installer_options(host)
       host.host_hash.select { |k,v| [ :pe_installer_conf_file, :pe_installer_conf_setting].include?(k) }
     end
-
-    context 'when version < 2016.2.0' do
-      let(:pe_ver) { '3.8.5' }
-
-      it 'sets legacy settings' do
-        expect(slice_installer_options(host)).to eq(legacy_settings)
-      end
-    end
-
-    context 'when version >= 2016.2.0' do
-      let (:pe_ver) { '2016.2.0' }
-
-      it 'test use_meep?' do
-        expect(subject.use_meep?('3.8.5')).to eq(false)
-        expect(subject.use_meep?('2016.1.2')).to eq(false)
-        expect(subject.use_meep?('2016.2.0')).to eq(true)
-        expect(subject.use_meep?('2016.2.0-rc1-gabcdef')).to eq(true)
-      end
-
-      it 'sets meep settings' do
-        expect(slice_installer_options(host)).to eq(meep_settings)
-      end
-    end
   end
 
   RSpec.shared_examples 'test flag' do |flag_name|
@@ -1114,7 +1091,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
@@ -1144,7 +1121,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar.gz'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
@@ -1190,7 +1167,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = machost['pe_dir']
       filename = "#{ machost['dist'] }"
       extension = '.dmg'
-      expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -O #{ path }/#{ filename }#{ extension }" ).once
+      expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -L -O #{ path }/#{ filename }#{ extension }" ).once
       subject.fetch_pe( [machost], {} )
     end
 
@@ -1644,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.2
+  version: 2.11.7
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -248,6 +248,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
@@ -306,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!