beaker-pe 2.1.10 → 2.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca4e8cf7a404336d4ace09991a7abeffde1e07b6
-  data.tar.gz: 2f049d861b216601f53bcaea9aae18a484afdf5c
+  metadata.gz: 56ad877ca03051cb37777bfab4e4fdddb77812f8
+  data.tar.gz: 76f82d5067afd25b8d91e028635237937faf403e
 SHA512:
-  metadata.gz: be907d05e3883b86cbe9a965fab8c3a635517de48fe70bf67323b1a05d6ec21b6a7c48494486e96d67db14176599c81b0ace33ec91ef50fb9144a0d0a0135c2c
-  data.tar.gz: 1c27c6aa84aaffe7c56eeafdf8e124d74016474e8a55391dada0400a8add201853290211c03e16313726f28560634cef615474a417a6ede66b92ad6ba2ec1dcb
+  metadata.gz: 96d767c4d62da433440997b1f4e993ebe4781c52b4ecd48722081dd502228efca025ab7714dd2cfad9aac5ab4f6ecf82d7a7116eb96fb474254f9e87be8f7d45
+  data.tar.gz: ee43b324c93a8a99429bb33e3331d4564c25eb622cdfe5b9624897ecffd43c6a8d9a2b94d8665238a3896b6d8495895c10db7e2a330a826f6d5704a11f3d4539

data/beaker-pe.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   # Documentation dependencies
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown'
+  s.add_development_dependency 'activesupport', '~> 5.0'
   s.add_development_dependency 'thin'
 
   # Run time dependencies

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

@@ -790,7 +790,7 @@ module Beaker
               if host['roles'].include?('frictionless') &&  (! version_is_less(version, '3.2.0'))
                 # If We're *not* running the classic installer, we want
                 # to make sure the master has packages for us.
-                if host['platform'] != master['platform'] # only need to do this if platform differs
+                if host['packaging_platform'] != master['packaging_platform'] # only need to do this if platform differs
                   deploy_frictionless_to_master(host)
                 end
                 install_ca_cert_on(host, opts)
@@ -1884,7 +1884,7 @@ module Beaker
                agent_nodes.each do |agent|
                  # If We're *not* running the classic installer, we want
                  # to make sure the master has packages for us.
-                 if agent['platform'] != master['platform'] # only need to do this if platform differs
+                 if agent['packaging_platform'] != master['packaging_platform'] # only need to do this if platform differs
                    deploy_frictionless_to_master(agent)
                  end
                end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.1.10'
+        STRING = '2.1.11'
       end
 
     end

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

@@ -1371,7 +1371,7 @@ describe ClassMixedWithDSLInstallUtils do
     let(:split_master) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['master', 'agent']) }
     let(:split_database) { make_host('split_database', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['database', 'agent']) }
     let(:split_console) { make_host('mono_master', :pe_ver => '2017.2', :platform => 'ubuntu-16.04-x86_64', :roles => ['dashboard', 'agent']) }
-    let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :roles => ['agent'])}
+    let(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :packaging_platform => 'el-7-x86_64', :roles => ['agent'])}
 
     it 'will do a monolithic installation of PE with an external postgres that is managed by PE' do
       allow(subject).to receive(:fetch_pe).with([mono_master, pe_postgres], {}).and_return(true)
@@ -1602,7 +1602,7 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe '#deploy_frictionless_to_master' 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(:agent) { make_host('agent', :pe_ver => '2017.2', :platform => 'el-7-x86_64', :packaging_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') }
@@ -1972,9 +1972,9 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe 'simple_monolithic_install' do
-    let(:monolithic) { make_host('monolithic', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => [ 'master', 'database', 'dashboard' ]) }
-    let(:el_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :roles => ['frictionless']) }
-    let(:deb_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'debian-7-x86_64', :roles => ['frictionless']) }
+    let(:monolithic) { make_host('monolithic', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :packaging_platform => 'el-7-x86_64', :roles => [ 'master', 'database', 'dashboard' ]) }
+    let(:el_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'el-7-x86_64', :packaging_platform => 'el-7-86_64', :roles => ['frictionless']) }
+    let(:deb_agent) { make_host('agent', :pe_ver => '2016.4', :platform => 'debian-7-x86_64', :packaging_platform => 'debian-7-x86_64', :roles => ['frictionless']) }
 
     before :each do
       allow(subject).to receive(:on)
@@ -2010,10 +2010,12 @@ describe ClassMixedWithDSLInstallUtils do
     let(:monolithic) { make_host('monolithic',
                                  :pe_ver => '2016.4',
                                  :platform => 'el-7-x86_64',
+                                 :packaging_platform => 'el-7-x86_64',
                                  :roles => ['master', 'database', 'dashboard']) }
     let(:agent) { make_host('agent',
                             :pe_ver => '2016.4',
                             :platform => 'el-7-x86_64',
+                            :packaging_platform => 'el-7-x86_64',
                             :roles => ['frictionless']) }
     before :each do
       allow(subject).to receive(:on)
@@ -2032,6 +2034,7 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'calls deploy_frictionless_to_master if agent platform is different from master' do
       agent['platform'] = 'deb-7-x86_64'
+      agent['packaging_platform'] = 'deb-7-x86_64'
       expect(subject).to receive(:deploy_frictionless_to_master)
       subject.install_agents_only_on([agent], opts)
     end

data/spec/helpers.rb

@@ -26,6 +26,7 @@ end
 
 module HostHelpers
   HOST_DEFAULTS = { :platform => 'unix',
+                    :packaging_platform => 'unix',
                     :roles => ['agent'],
                     :snapshot => 'snap',
                     :ip => 'default.ip.address',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.11
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement