beaker-puppet_install_helper 0.9.4 → 0.9.6

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: 05e4a9ea911a1bb8e396daf86a75ab4dc1edfba2
4
- data.tar.gz: fc51b63f1cd730c17eadd8d010f705c8d8e2b13c
3
+ metadata.gz: 20829314eda3f99470fb31a9e0bf418d92ea85da
4
+ data.tar.gz: a0d6e6fcdc62f4fc234455663e37eaddd8564107
5
5
  SHA512:
6
- metadata.gz: b017170abbb33e3e9245c55185ba6631b28629fd2be41fea7a169a5d0006e653b3f2b74aca1c046d2a4b4cd588fab0137289593813aafcdfce989d85341f6b74
7
- data.tar.gz: 51c4f620b8dab296df32bb58effe69d51c4edd5ed20af8456add07e39b7c42a58dfacd7067723348814430e31202c87e4dbdedbec0a8f664ffe20309e91ea10d
6
+ metadata.gz: ec38831264c4cc35343a235b29a2481912b9066b82905ce557207c33b13f956883ec315e318629f0369a614821f6cff6a5ad529638e6d2477e5cb5320a4587a4
7
+ data.tar.gz: 12ffdc72c008212caa521fb41d077a7a01dcb0116ccab875acd0cd857aee777db4af5f6e71481e09f9ff61e49d73fa1a45f61d187294464800b40a0ff2c344a2
data/Gemfile CHANGED
@@ -4,7 +4,7 @@ gemspec
4
4
 
5
5
  group :test do
6
6
  gem 'beaker', '= 2.52.0' if RUBY_VERSION <= '2.1.6'
7
- gem 'beaker' if RUBY_VERSION > '2.1.6'
7
+ gem 'beaker', '~> 4' if RUBY_VERSION > '2.1.6'
8
8
  gem 'bundler', '~> 1.9'
9
9
  gem 'rake', '~> 10.0'
10
10
  gem 'rspec', '~> 3'
data/README.md CHANGED
@@ -6,7 +6,7 @@ This gem is simply an abstraction for the various ways that we install puppet fr
6
6
 
7
7
  The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `BEAKER_PUPPET_AGENT_VERSION` and/or `BEAKER_PUPPET_COLLECTION` in the following combinations to have puppet installed on the desired hosts. The nodeset should be configured with `type: pe` or `type: aio` to control the type of install.
8
8
 
9
- - `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6-nightly` etc. This may change with time.
9
+ - `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6`, `puppet6-nightly` etc. This may change with time.
10
10
  - `BEAKER_PUPPET_AGENT_VERSION=<version>` to specify
11
11
  - `BEAKER_IS_PE=<yes or no>` may be used to force a nodeset to be PE or not, regardless of the nodeset `type` or absence thereof.
12
12
  - `BEAKER_PE_VER=<pe version>` may be used to specify the PE version for masters. Eg: `BEAKER_PE_VER=2017.3.5`
@@ -1,6 +1,10 @@
1
+ # -*- encoding: utf-8 -*-
2
+ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
3
+ require 'beaker-puppet_install_helper/version'
4
+
1
5
  Gem::Specification.new do |s|
2
6
  s.name = 'beaker-puppet_install_helper'
3
- s.version = '0.9.4'
7
+ s.version = Beaker::PuppetInstallHelper::VERSION
4
8
  s.authors = ['Puppetlabs']
5
9
  s.email = ['hunter@puppet.com']
6
10
  s.homepage = 'https://github.com/puppetlabs/beaker-puppet_install_helper'
@@ -17,5 +21,6 @@ Gem::Specification.new do |s|
17
21
  s.add_development_dependency 'rspec'
18
22
 
19
23
  # Run time dependencies
20
- s.add_runtime_dependency 'beaker', '>= 2.0'
24
+ s.add_runtime_dependency 'beaker', '~> 4.0'
25
+ s.add_runtime_dependency 'beaker-pe', '~> 2.0'
21
26
  end
@@ -0,0 +1,5 @@
1
+ module Beaker
2
+ module PuppetInstallHelper
3
+ VERSION = "0.9.6"
4
+ end
5
+ end
@@ -1,4 +1,5 @@
1
1
  require 'beaker'
2
+ require 'beaker-pe'
2
3
  require 'beaker/ca_cert_helper'
3
4
 
4
5
  module Beaker::PuppetInstallHelper
@@ -20,7 +21,8 @@ module Beaker::PuppetInstallHelper
20
21
  # BEAKER_PUPPET_COLLECTION=pc1 <-- for latest 4.x
21
22
  # BEAKER_PUPPET_COLLECTION=puppet5 <-- for latest 5.x
22
23
  # BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_PUPPET_AGENT_VERSION=5.3.1 <-- for specific version
23
- # BEAKER_PUPPET_COLLECTION=puppet6-nightly <-- for latest nightly build
24
+ # BEAKER_PUPPET_COLLECTION=puppet6 <-- for latest 6.x
25
+ # BEAKER_PUPPET_COLLECTION=puppet-nightly <-- for latest nightly build
24
26
  # BEAKER_PUPPET_AGENT_SHA=0ed2bbc918326263da9d97d0361a9e9303b52938 <-- for specific dev build
25
27
 
26
28
  # Ensure windows 2003 is always set to 32 bit
@@ -91,7 +93,7 @@ module Beaker::PuppetInstallHelper
91
93
  end
92
94
 
93
95
  agent_sha = find_agent_sha
94
- if agent_sha.nil?
96
+ if agent_sha.nil? || agent_sha.empty?
95
97
  install_puppet_agent_on(hosts, options.merge(version: version))
96
98
  else
97
99
  # If we have a development sha, assume we're testing internally
@@ -103,6 +103,7 @@ describe 'Beaker::PuppetInstallHelper' do
103
103
  before :each do
104
104
  allow(subject).to receive(:master).and_return(hosts[1])
105
105
  allow(subject).to receive(:sign_certificate_for)
106
+ allow(subject).to receive(:run_agent_on)
106
107
  allow(subject).to receive(:puppet_agent)
107
108
  allow(subject).to receive(:puppet).with('resource', 'service', 'puppetserver', 'ensure=running')
108
109
  allow(subject).to receive(:puppet).with('resource', 'host', 'puppet', 'ensure=present', 'ip=1.2.3.4')
@@ -161,7 +162,7 @@ describe 'Beaker::PuppetInstallHelper' do
161
162
  subject.run_puppet_install_helper_on(hosts)
162
163
  end
163
164
  end
164
- ['puppet5', 'puppet6-nightly'].each do |collection|
165
+ ['puppet5', 'puppet6-nightly', 'puppet6'].each do |collection|
165
166
  context "with #{collection} collection" do
166
167
  it "installs puppet-agent from #{collection} repo" do
167
168
  ENV['BEAKER_PUPPET_COLLECTION'] = collection
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.9.4
4
+ version: 0.9.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-07 00:00:00.000000000 Z
11
+ date: 2018-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
@@ -28,14 +28,28 @@ dependencies:
28
28
  name: beaker
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: '4.0'
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: '4.0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: beaker-pe
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
32
46
  - !ruby/object:Gem::Version
33
47
  version: '2.0'
34
48
  type: :runtime
35
49
  prerelease: false
36
50
  version_requirements: !ruby/object:Gem::Requirement
37
51
  requirements:
38
- - - ">="
52
+ - - "~>"
39
53
  - !ruby/object:Gem::Version
40
54
  version: '2.0'
41
55
  description: Provides a unified external interface to choosing which version of puppet
@@ -56,6 +70,7 @@ files:
56
70
  - README.md
57
71
  - Rakefile
58
72
  - beaker-puppet_install_helper.gemspec
73
+ - lib/beaker-puppet_install_helper/version.rb
59
74
  - lib/beaker/ca_cert_helper.rb
60
75
  - lib/beaker/puppet_install_helper.rb
61
76
  - spec/spec_helper.rb
@@ -81,11 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
81
96
  version: '0'
82
97
  requirements: []
83
98
  rubyforge_project:
84
- rubygems_version: 2.6.14
99
+ rubygems_version: 2.5.1
85
100
  signing_key:
86
101
  specification_version: 4
87
102
  summary: Puppet install helper for Beaker
88
- test_files:
89
- - spec/spec_helper.rb
90
- - spec/unit/beaker/ca_cert_helper_spec.rb
91
- - spec/unit/beaker/puppet_install_helper_spec.rb
103
+ test_files: []