beaker-puppet_install_helper 0.1.4 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0376a9cb849614ccc696bea9f2821d2159bc070e
4
- data.tar.gz: 2ec31d4e30946d3ba8f5ca282bf7c8a3337cd751
3
+ metadata.gz: bd52ff8b7f59bda534df9bbc0994e961013c4148
4
+ data.tar.gz: 601250b1a278c70c7531c864df56030cb737ed86
5
5
  SHA512:
6
- metadata.gz: c6af92cf4c1d96602e2bfc6fdf8e0c49c44ace7a904777b1f9b5334edd58d203950ac590e5f7f5534120413a9dbd192a77affe34262a2b8dd0672641dd94f151
7
- data.tar.gz: 514f7dcb29d92dfee33ab9430d08f21f1ad62871ace54d310a88e8a1dc0bbcb084f97bf0b11372c3900b7051031a252140ad14067bc84c8edd041e34da24a947
6
+ metadata.gz: 3b00d10cb538f46ce75f169a45581905f019ef14cc19ca0a3908c5ba8b08500dc441cf195e7959b879ed1f3f0dc61b4ae86e7ed05d073a7c112c09c1c906441c
7
+ data.tar.gz: d8587edaec5ac8b4938d03309dcd2acc777b7b54db1227fb5dbf18179b2f92791ef6081df25450977ae87086971560fb490a05c5479f8cf19ce99394e15cecc0
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "beaker-puppet_install_helper"
3
- s.version = '0.1.4'
3
+ s.version = '0.2.0'
4
4
  s.authors = ["Puppetlabs"]
5
5
  s.email = ["hunter@puppetlabs.com"]
6
6
  s.homepage = "https://github.com/puppetlabs/beaker-puppet_install_helper"
@@ -23,6 +23,13 @@ module Beaker::PuppetInstallHelper
23
23
  # PUPPET_INSTALL_TYPE=foss
24
24
  # PUPPET_INSTALL_TYPE=agent
25
25
 
26
+ # Ensure windows 2003 is always set to 32 bit
27
+ Array(hosts).each do |host|
28
+ if host["platform"] =~ /windows-2003/i
29
+ host["install_32"] = true
30
+ end
31
+ end
32
+
26
33
  case type
27
34
  when "pe"
28
35
  # This will skip hosts that are not supported
@@ -8,8 +8,10 @@ describe 'beaker::puppet_install_helper' do
8
8
  foss_host = double(:is_pe? => false)
9
9
  pe_host = double(:is_pe? => true)
10
10
  allow(foss_host).to receive(:[]).with("distmoduledir").and_return("/dne")
11
+ allow(foss_host).to receive(:[]).with("platform").and_return("Debian")
11
12
  allow(foss_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
12
13
  allow(pe_host).to receive(:[]).with("distmoduledir").and_return("/dne")
14
+ allow(pe_host).to receive(:[]).with("platform").and_return("Debian")
13
15
  allow(pe_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
14
16
  [foss_host, pe_host]
15
17
  end
@@ -44,6 +46,13 @@ describe 'beaker::puppet_install_helper' do
44
46
  expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
45
47
  subject.run_puppet_install_helper_on(hosts)
46
48
  end
49
+ it "windows 2003 node" do
50
+ w2k3 = {"platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
51
+ win_hosts = [ w2k3 ]
52
+ expect(subject).to receive(:default).and_return(double(:is_pe? => true))
53
+ expect(subject).to receive(:install_pe_on).with([w2k3.merge({'install_32' => true})], {"pe_ver" => nil})
54
+ subject.run_puppet_install_helper_on(win_hosts)
55
+ end
47
56
  it "uses PE by default for PE nodes" do
48
57
  expect(subject).to receive(:default).and_return(hosts[1])
49
58
  expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet_install_helper
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-12 00:00:00.000000000 Z
11
+ date: 2015-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec