beaker-pe 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd2a800e8f1a198eb856bc9db8c6464e0c44590
-  data.tar.gz: 8a6fd3b4534623c1a8acb9a77636afb2aaf844d3
+  metadata.gz: 31865709a8e1ab78d989ec9755b8408726a2d5fb
+  data.tar.gz: 50de0ccbbb8044ef6175acad3e03339077a730b4
 SHA512:
-  metadata.gz: 4274167ed8ceb163325d1486dda58618a460a9c7587150fbcdf0a3369d716a30f137ecbd33bfb47e713805f0c9fa103b9e1d7a7c51c9267f9401d03e33575ea0
-  data.tar.gz: 19ea7205ee7b335aee07d8ab7f393aed13cb658893e0f0e04837d5ea0d0bcaefcc700b39e6646ed4acad7441e9adf75e6c2f7eea805b80ba5e5cd2c9625fc183
+  metadata.gz: 21ff873513cfdbd52e26e52dff0a78ba667cd324846e344ac9f5cbccd145cf0f6fcb5698bca9553e7296375689a998a58cc7d947ac18ac768306f68451d572f2
+  data.tar.gz: 7b42ba05485dff1fc4afa091509efd676e8c09e3e8284fdcdc64817efb1f259edf7d2d9a730722571167037f4be52cb228f79d74b251a34cb1eaeb216597cb49

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

@@ -6,6 +6,7 @@ require "beaker-answers"
 require "timeout"
 require "json"
 require "deep_merge"
+
 module Beaker
   module DSL
     module InstallUtils
@@ -1556,6 +1557,10 @@ module Beaker
               end
           end
 
+          step "Stop agent service on infrastructure nodes" do
+            stop_agent_on(pe_infrastructure, :run_in_parallel => true)
+          end
+
           step "First puppet run on infrastructure + postgres node" do
             [master, database, dashboard, pe_postgres].uniq.each do |host|
               on host, 'puppet agent -t', :acceptable_exit_codes => [0,2]

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

@@ -99,7 +99,8 @@ module Beaker
               )
 
               scp_to host, list, '/etc/apt/sources.list.d'
-              if variant == 'ubuntu' && version.split('.').first.to_i >= 18
+              # Ubuntu platform gets host['platform'].with_version_codename (see line 57)
+              if variant == 'ubuntu' && version == 'bionic'
                 apt_conf_content = 'Acquire::AllowInsecureRepositories "true";'
               else
                 apt_conf_content = 'APT::Get::AllowUnauthenticated "true";'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.1.3'
+        STRING = '2.1.4'
       end
 
     end

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

@@ -1387,6 +1387,9 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:execute_installer_cmd).with(mono_master, {}).twice
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
 
+      allow(subject).to receive(:stop_agent_on).and_return(true)
+      expect(subject).to receive(:stop_agent_on).with([mono_master, pe_postgres], :run_in_parallel => true).once
+      
       allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).exactly(3).times
       allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once
 
@@ -1413,6 +1416,10 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:is_expected_pe_postgres_failure?).and_return(true)
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
       expect(subject).to receive(:execute_installer_cmd).with(mono_master, {}).once.ordered
+
+      allow(subject).to receive(:stop_agent_on).and_return(true)
+      expect(subject).to receive(:stop_agent_on).with([mono_master, pe_postgres], :run_in_parallel => true).once
+
       allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).exactly(3).times
       allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once
 
@@ -1454,6 +1461,10 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:execute_installer_cmd).with(mono_master, {}).once
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
 
+      allow(subject).to receive(:stop_agent_on).and_return(true)
+      expect(subject).to receive(:stop_agent_on).with([mono_master, pe_postgres], :run_in_parallel => true).once
+
+
       allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).twice
       allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once
 
@@ -1477,6 +1488,9 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:execute_installer_cmd).with(split_console, {}).once
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
 
+      allow(subject).to receive(:stop_agent_on).and_return(true)
+      expect(subject).to receive(:stop_agent_on).with([split_master, split_database, split_console, pe_postgres], :run_in_parallel => true).once
+
       allow(subject).to receive(:on).with(split_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).twice
       allow(subject).to receive(:on).with(split_database, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
       allow(subject).to receive(:on).with(split_console, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
@@ -1502,6 +1516,9 @@ describe ClassMixedWithDSLInstallUtils do
       allow(subject).to receive(:execute_installer_cmd).with(split_console, {}).once
       allow(subject).to receive(:execute_installer_cmd).with(pe_postgres, {}).once
 
+      allow(subject).to receive(:stop_agent_on).and_return(true)
+      expect(subject).to receive(:stop_agent_on).with([split_master, split_database, split_console, pe_postgres], :run_in_parallel => true).once
+
       allow(subject).to receive(:on).with(split_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).twice
       allow(subject).to receive(:on).with(split_database, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once
       allow(subject).to receive(:on).with(split_console, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).once

metadata

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