beaker-puppet_install_helper 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0376a9cb849614ccc696bea9f2821d2159bc070e
-  data.tar.gz: 2ec31d4e30946d3ba8f5ca282bf7c8a3337cd751
+  metadata.gz: bd52ff8b7f59bda534df9bbc0994e961013c4148
+  data.tar.gz: 601250b1a278c70c7531c864df56030cb737ed86
 SHA512:
-  metadata.gz: c6af92cf4c1d96602e2bfc6fdf8e0c49c44ace7a904777b1f9b5334edd58d203950ac590e5f7f5534120413a9dbd192a77affe34262a2b8dd0672641dd94f151
-  data.tar.gz: 514f7dcb29d92dfee33ab9430d08f21f1ad62871ace54d310a88e8a1dc0bbcb084f97bf0b11372c3900b7051031a252140ad14067bc84c8edd041e34da24a947
+  metadata.gz: 3b00d10cb538f46ce75f169a45581905f019ef14cc19ca0a3908c5ba8b08500dc441cf195e7959b879ed1f3f0dc61b4ae86e7ed05d073a7c112c09c1c906441c
+  data.tar.gz: d8587edaec5ac8b4938d03309dcd2acc777b7b54db1227fb5dbf18179b2f92791ef6081df25450977ae87086971560fb490a05c5479f8cf19ce99394e15cecc0

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.1.4'
+  s.version     = '0.2.0'
   s.authors     = ["Puppetlabs"]
   s.email       = ["hunter@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-puppet_install_helper"

data/lib/beaker/puppet_install_helper.rb

@@ -23,6 +23,13 @@ module Beaker::PuppetInstallHelper
     # PUPPET_INSTALL_TYPE=foss
     # PUPPET_INSTALL_TYPE=agent
 
+    # Ensure windows 2003 is always set to 32 bit
+    Array(hosts).each do |host|
+      if host["platform"] =~ /windows-2003/i
+        host["install_32"] = true
+      end
+    end
+
     case type
     when "pe"
       # This will skip hosts that are not supported

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -8,8 +8,10 @@ describe 'beaker::puppet_install_helper' do
     foss_host = double(:is_pe? => false)
     pe_host = double(:is_pe? => true)
     allow(foss_host).to receive(:[]).with("distmoduledir").and_return("/dne")
+    allow(foss_host).to receive(:[]).with("platform").and_return("Debian")
     allow(foss_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
     allow(pe_host).to receive(:[]).with("distmoduledir").and_return("/dne")
+    allow(pe_host).to receive(:[]).with("platform").and_return("Debian")
     allow(pe_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
     [foss_host, pe_host]
   end
@@ -44,6 +46,13 @@ describe 'beaker::puppet_install_helper' do
         expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
         subject.run_puppet_install_helper_on(hosts)
       end
+      it "windows 2003 node" do
+        w2k3 = {"platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
+        win_hosts = [ w2k3 ]
+        expect(subject).to receive(:default).and_return(double(:is_pe? => true))
+        expect(subject).to receive(:install_pe_on).with([w2k3.merge({'install_32' => true})], {"pe_ver" => nil})
+        subject.run_puppet_install_helper_on(win_hosts)
+      end
       it "uses PE by default for PE nodes" do
         expect(subject).to receive(:default).and_return(hosts[1])
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec