beaker-pe 1.12.1 → 1.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM1MjMxNjZkYjU3ZWM2ZGI4NDhjMmI0ZWYwM2FjOGZkZmQ0NmNmMA==
+    YTA2MWQxYmE4MDE4M2E3MzdjNzkzZWQwODc2ODRlMzJmOTFhOTE5OQ==
   data.tar.gz: !binary |-
-    YmI3YmJlOWE2NjYwYzUwNTBhYTMyYWQyYTY5OGVmMTFmN2YwMmNmNA==
+    MDU5OTkyNTgzODI1MTFjM2Q1OGYyMGMyZWQ2ZTE2NjQxNGM0MTdlZg==
 SHA512:
   metadata.gz: !binary |-
-    NTVjYTNmOTJkOWY0YzVmNjUyOGM0MjAyMzVlZmVhZDI5ZTk3NjhlMjJjOTNm
-    NmI0YzZlYTMwYWIxYTM1M2FkZTJlYzIwYzlhZTY2M2Q4YTYwNDM1MTRmNTdl
-    NjQwY2YxZGY0Y2FkMzZmZTk0OWU1MDUzZDJiZTQ3YWM4NTU4ODA=
+    OTZmNzgyMmMzY2ExZmRhZTE4NzAyMGZmNDU1NWMwMzhmY2RiYjNkNzcxNWI0
+    OTc2YjY2ZTU1NmI1NGJjYjJiOTRjMzQ4NTY1MjQyZDQ3YzFmOWE4ZDIzNDI3
+    MWIzOWI2NDkyM2ZhOGQwNmUzNDA0ZjFkZjViYjg5NzM5OWUwY2Q=
   data.tar.gz: !binary |-
-    NzBhYTVjOTRmMjc5ODRhZWExNjliY2VkMmI5ODk3YzExODQ3YmIxMWMwMGYw
-    NDBjOTQwZjY5ZTQ1ZGE2MTk5MDJjNWQ0MDNhNWY2ODI5YTgzZGM3ZGY3MGU4
-    ODQxNGFjNzYzODlhMjMxYWVjMDU3NjAyZTMyMGM3ODAzYjg5ODA=
+    MjkyZjI3MWFjOTczOTZlNjA3OTI4MTNhMmFkODQyMmJhOTZlNDM0ZDE5YTEw
+    MWU3ZDAzYjg2ZGEyYTk2ZWI1ZWMxMmY1YjRkZTE4YzA0MjFiMDc1MDkxYjlk
+    M2EwNzM4YTNjMjNiNzk5MDk3ZDAzZDAxZTFjZGQyYjAxN2IwZWE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 29 Mar, 2017 (95b0e94f)](#LATEST)
+* [LATEST - 6 Apr, 2017 (197a55dd)](#LATEST)
+* [1.12.1 - 29 Mar, 2017 (fe8bbc82)](#1.12.1)
 * [1.12.0 - 23 Mar, 2017 (0784adc6)](#1.12.0)
 * [1.11.0 - 23 Mar, 2017 (6c3b0067)](#1.11.0)
 * [1.10.0 - 20 Mar, 2017 (22e22ca8)](#1.10.0)
@@ -35,7 +36,31 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 29 Mar, 2017 (95b0e94f)
+### <a name = "LATEST">LATEST - 6 Apr, 2017 (197a55dd)
+
+* (GEM) update beaker-pe version to 1.13.0 (197a55dd)
+
+* (BKR-806) Add tests for frictionless repo setup (5e723bb2)
+
+* (BKR-806) Only add pe_repo classes once (a718fbb9)
+
+
+```
+(BKR-806) Only add pe_repo classes once
+
+Previously, if installing multiple agents with the same platform, the
+work to add the appropriate pe_repo class to the master would be
+performed once for each agent. Because that requires running `puppet
+agent -t` on the master, it can add a significant amount of unnecessary
+overhead to the install process when installing several agents.
+
+We now check whether the class has already been included in the Beaker
+Frictionless Agent group and skip running puppet on the master if it
+has.
+```
+### <a name = "1.12.1">1.12.1 - 29 Mar, 2017 (fe8bbc82)
+
+* (HISTORY) update beaker-pe history for gem release 1.12.1 (fe8bbc82)
 
 * (GEM) update beaker-pe version to 1.12.1 (95b0e94f)
 

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

@@ -340,11 +340,13 @@ module Beaker
               node_group['classes'] ||= {}
             end
 
-            # add the pe_repo platform class
-            node_group['classes'][klass] = {}
+            # add the pe_repo platform class if it's not already present
+            if ! node_group['classes'].include?(klass)
+              node_group['classes'][klass] = {}
 
-            _console_dispatcher.create_new_node_group_model(node_group)
-            on master, puppet("agent -t"), :acceptable_exit_codes => [0,2]
+              _console_dispatcher.create_new_node_group_model(node_group)
+              on master, puppet("agent -t"), :acceptable_exit_codes => [0,2]
+            end
           end
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.12.1'
+        STRING = '1.13.0'
       end
 
     end

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'scooter'
 
 class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::InstallUtils
@@ -928,6 +929,39 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  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(:dispatcher) { double('dispatcher') }
+    let(:node_group) { {} }
+
+    before :each do
+      allow(subject).to receive(:on)
+
+      allow(subject).to receive(:hosts).and_return([master, agent])
+      allow(Scooter::HttpDispatchers::ConsoleDispatcher).to receive(:new).and_return(dispatcher)
+
+      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)}
+    end
+
+    it 'adds the right pe_repo class to the Beaker Frictionless Agent group' do
+      subject.deploy_frictionless_to_master(agent)
+
+      expect(node_group['rule']).to eq(['and', ['=', 'name', 'master']])
+      expect(node_group['classes']).to include('pe_repo::platform::el_7_x86_64')
+    end
+
+    it 'only adds classes once' do
+      expect(dispatcher).to receive(:create_new_node_group_model).once
+
+      subject.deploy_frictionless_to_master(agent)
+      subject.deploy_frictionless_to_master(agent)
+
+      expect(node_group['classes']).to include('pe_repo::platform::el_7_x86_64')
+    end
+  end
+
   describe 'do_install' do
     it 'chooses to do a simple monolithic install when appropriate' do
       expect(subject).to receive(:simple_monolithic_install)

metadata

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