beaker-pe 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2d9c6c78aa9f221e4b2bb52d491706c289ba2d
-  data.tar.gz: 047895154080e79a127ddcfc6ce1472933c63e45
+  metadata.gz: b724e458fae680e87975fd6f1bf24d872bdf0888
+  data.tar.gz: 6e16e7c23979b270f97c4562872eb6d23fce24e3
 SHA512:
-  metadata.gz: 887d9e30921f79f80dc9f841584164077f6d3b56622d6fb85d4618409446f81892bcfd8acdf50711bbb519e8e76a17f3f1d9f032e5cf17d5dbe54a61703a364c
-  data.tar.gz: 04321b38d606f86326a9054bd539b03ba088f9708a536c0a5379c89700c8896019783c2377b885e13f418f07ba70ce8841c2c163166f2b5fa30f8e096ab5cc6f
+  metadata.gz: 86d1babe1df0dd57d6086a71961be8f1b7427267087e3f9c66a086ad939202f35a8a9af7385e8fb74879fbabfce2f24006d500d91ef2598e84e8e6d858bd7528
+  data.tar.gz: 1cd6e4986bc8fe70b102fd1f101e5de36461283c1cb50244f74f53e155afc0fb3063ad34e998ac181c17a7619e89cfc759740578b9462852dd4b2a365849c01a

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

@@ -472,7 +472,7 @@ module Beaker
                 # If we are connecting through loadbalancer, download the agent tarballs to compile masters
                 if lb_connect_loadbalancer_exists?
                   hosts.each do |h|
-                    if h['roles'].include?('compile_master')
+                    if h['roles'].include?('compile_master') || h['roles'].include?('pe_compiler')
                       retry_on(h, puppet("agent -t"), retry_opts)
                     end
                   end
@@ -529,7 +529,7 @@ module Beaker
         # @api private
         def verify_vm_resources(hosts)
           logger.notify("Checking the status of system (CPU/Mem) resources on PE Infrastructure nodes.")
-          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database']}, hosts)
+          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'pe_compiler', 'dashboard', 'database']}, hosts)
           pe_infrastructure.each do |host|
             on host, "top -bn1", :accept_all_exit_codes => true
           end
@@ -1001,7 +1001,7 @@ module Beaker
         # Runs puppet on all nodes, unless they have the roles: master,database,console/dashboard
         # @param [Array<Host>] hosts The sorted hosts to install or upgrade PE on
         def run_puppet_on_non_infrastructure_nodes(all_hosts)
-          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'dashboard', 'database']}, all_hosts)
+          pe_infrastructure = select_hosts({:roles => ['master', 'compile_master', 'pe_compiler', 'dashboard', 'database']}, all_hosts)
           non_infrastructure = all_hosts.reject{|host| pe_infrastructure.include? host}
           on non_infrastructure, puppet_agent('-t'), :acceptable_exit_codes => [0,2], :run_in_parallel => true
         end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.1.6'
+        STRING = '2.1.7'
       end
 
     end

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

@@ -59,12 +59,13 @@ describe ClassMixedWithDSLInstallUtils do
   let(:lei_hosts)     { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
-                                      :type => 'pe'}, 4 ) }
+                                      :type => 'pe'}, 5 ) }
   let(:lb_test_hosts) { lei_hosts[0][:roles] = ['master', 'database', 'dashboard']
                         lei_hosts[1][:roles] = ['loadbalancer', 'lb_connect']
                         lei_hosts[2][:roles] = ['compile_master']
                         lei_hosts[3][:roles] = ['frictionless', 'lb_connect']
                         lei_hosts[3][:working_dir] = '/tmp'
+                        lei_hosts[4][:roles] = ['pe_compiler']
                         lei_hosts }
 
   let(:logger) do
@@ -1603,6 +1604,7 @@ describe ClassMixedWithDSLInstallUtils do
     let(:master) { make_host('master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'database', 'dashboard']) }
     let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
     let(:compile_master) { make_host('agent', :pe_ver => '2017.2', :roles => ['frictionless', 'compile_master']) }
+    let(:pe_compiler) { make_host('agent', :pe_ver => '2019.2', :roles => ['frictionless', 'pe_compiler']) }
     let(:dispatcher) { double('dispatcher') }
     let(:node_group) { { 'classes' => {} } }
 
@@ -1615,6 +1617,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow(dispatcher).to receive(:get_node_group_by_name).and_return(node_group)
       allow(dispatcher).to receive(:create_new_node_group_model) {|model| node_group.update(model)}
       allow(subject).to receive(:compile_masters).and_return([compile_master])
+      allow(subject).to receive(:pe_compilers).and_return([pe_compiler])
     end
 
     it 'adds the right pe_repo class to the PE Master group' do
@@ -2283,6 +2286,9 @@ describe ClassMixedWithDSLInstallUtils do
     let(:compiler)      { make_host( 'compiler',     { :platform => 'linux',
                                                        :pe_ver   => '4.0',
                                                        :roles => ['agent', 'compile_master']})}
+    let(:pe_compiler)   { make_host( 'pe_compiler',  { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent', 'pe_compiler']})}
 
     it 'sorts hosts with common PE roles' do
       these_hosts = [master, db, console, agent1, frictionless]
@@ -2298,12 +2304,13 @@ describe ClassMixedWithDSLInstallUtils do
 
     # Possibly needed for NetDev and Scale testing
     it 'defaults to classifying custom roles as "agent only"' do
-      these_hosts = [monolith, compiler, agent1, agent2]
+      these_hosts = [monolith, compiler, pe_compiler, agent1, agent2]
       agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
-      expect(agent_only.length).to be 3
+      expect(agent_only.length).to be 4
       expect(agent_only).to include(agent1)
       expect(agent_only).to include(agent2)
       expect(agent_only).to include(compiler)
+      expect(agent_only).to include(pe_compiler)
       expect(non_agent.length).to be 1
       expect(non_agent).to include(monolith)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec