Skip to content

Commit 90ffc5d

Browse files
rodjekrodjek
authored
Merge pull request #543 from rodjek/puppet_5
Test with Puppet ~> 5.0.0
2 parents 31226a8 + 5aea149 commit 90ffc5d

File tree

3 files changed

+36
-29
lines changed

3 files changed

+36
-29
lines changed

‎.travis.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ rvm:
1010
sudo: false
1111

1212
env:
13-
- PUPPET_GEM_VERSION='~> 4.8.0' COVERAGE=yes
13+
- PUPPET_GEM_VERSION='~> 5.0.0' COVERAGE=yes
14+
- PUPPET_GEM_VERSION='~> 4.10.0'
15+
- PUPPET_GEM_VERSION='~> 4.9.0'
16+
- PUPPET_GEM_VERSION='~> 4.8.0'
1417
- PUPPET_GEM_VERSION='~> 4.7.0'
1518
- PUPPET_GEM_VERSION='~> 4.5.0'
1619
- PUPPET_GEM_VERSION='~> 4.4.0'
1720
- PUPPET_GEM_VERSION='~> 4.3.0'
1821
- PUPPET_GEM_VERSION='~> 4.2.0'
19-
# Latest gem release
20-
- PUPPET_GEM_VERSION='~> 4.0'
2122
# Latest code from puppetlabs/puppet.git
2223
- PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master'
2324
- PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#stable'
@@ -29,20 +30,22 @@ matrix:
2930
env: PUPPET_GEM_VERSION='~> 3.8.0' RSPEC_GEM_VERSION='= 3.1.0'
3031
- rvm: 1.8.7
3132
env: PUPPET_GEM_VERSION='~> 2.7.0' RSPEC_GEM_VERSION='~> 2.14.0'
33+
- rvm: 1.9.3
34+
env: PUPPET_GEM_VERSION='~> 5.0.0'
35+
- rvm: 2.3.0
36+
env: PUPPET_GEM_VERSION='~> 5.0.0'
3237

3338
exclude:
34-
- rvm: 2.1
35-
env: PUPPET_GEM_VERSION='~> 4.1.0'
3639
# run Coveralls exactly once
3740
- rvm: 1.9.3
38-
env: PUPPET_GEM_VERSION='~> 4.8.0' COVERAGE=yes
41+
env: PUPPET_GEM_VERSION='~> 5.0.0' COVERAGE=yes
3942
- rvm: 2.3.0
40-
env: PUPPET_GEM_VERSION='~> 4.8.0' COVERAGE=yes
43+
env: PUPPET_GEM_VERSION='~> 5.0.0' COVERAGE=yes
4144

4245
allowed_failures:
4346
# Don't fail for puppet.git#master because it may be to blame for any failures
4447
- env: PUPPET_GEM_VERSION='https://github.com/puppetlabs/puppet.git#master'
4548

4649
notifications:
4750
email:
48-
- tim@github.com
51+
- tim@sharpe.id.au

‎README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,36 +61,36 @@ The path to the directory containing your basic manifests like `site.pp`.
6161

6262
#### module\_path
6363
Type | Default | Puppet Version(s)
64-
------ | -------- | -----------------
65-
String | Required | 2.x, 3.x, 4.x
64+
------ | -------- | ------------------
65+
String | Required | 2.x, 3.x, 4.x, 5.x
6666

6767
The path to the directory containing your Puppet modules.
6868

6969
#### default\_facts
7070
Type | Default | Puppet Version(s)
71-
---- | ------- | -----------------
72-
Hash | `{}` | 2.x, 3.x, 4.x
71+
---- | ------- | ------------------
72+
Hash | `{}` | 2.x, 3.x, 4.x, 5.x
7373

7474
A hash of default facts that should be used for all the tests.
7575

7676
#### hiera\_config
7777
Type | Default | Puppet Version(s)
7878
------ | ------------- | -----------------
79-
String | `"/dev/null"` | 3.x, 4.x
79+
String | `"/dev/null"` | 3.x, 4.x, 5.x
8080

8181
The path to your `hiera.yaml` file (if used).
8282

8383
#### default\_node\_params
8484
Type | Default | Puppet Version(s)
8585
---- | ------- | -----------------
86-
Hash | `{}` | 4.x
86+
Hash | `{}` | 4.x, 5.x
8787

8888
A hash of default node parameters that should be used for all the tests.
8989

9090
#### default\_trusted\_facts
9191
Type | Default | Puppet Version(s)
9292
---- | ------- | -----------------
93-
Hash | `{}` | 4.x
93+
Hash | `{}` | 4.x, 5.x
9494

9595
A hash of default trusted facts that should be used for all the tests
9696
(available in the manifests as the `$trusted` hash). In order to use this, the
@@ -99,22 +99,22 @@ A hash of default trusted facts that should be used for all the tests
9999
#### trusted\_node\_data
100100
Type | Default | Puppet Version(s)
101101
------- | ------- | -----------------
102-
Boolean | `false` | 3.x, 4.x
102+
Boolean | `false` | 3.x, 4.x, 5.x
103103

104104
Configures rspec-puppet to use the `$trusted` hash when compiling the
105105
catalogues.
106106

107107
#### confdir
108108
Type | Default | Puppet Version(s)
109-
------ | --------------- | -----------------
110-
String | `"/etc/puppet"` | 2.x, 3.x, 4.x
109+
------ | --------------- | ------------------
110+
String | `"/etc/puppet"` | 2.x, 3.x, 4.x, 5.x
111111

112112
The path to the main Puppet configuration directory.
113113

114114
#### config
115115
Type | Default | Puppet Version(s)
116-
------ | ---------------------- | -----------------
117-
String | Puppet's default value | 2.x, 3.x, 4.x
116+
------ | ---------------------- | ------------------
117+
String | Puppet's default value | 2.x, 3.x, 4.x, 5.x
118118

119119
The path to `puppet.conf`.
120120

@@ -136,7 +136,7 @@ stored outside of modules.
136136
#### environmentpath
137137
Type | Default | Puppet Version(s)
138138
------ | ------------------------------------- | -----------------
139-
String | `"/etc/puppetlabs/code/environments"` | 4.x
139+
String | `"/etc/puppetlabs/code/environments"` | 4.x, 5.x
140140

141141
The search path for environment directories.
142142

@@ -150,7 +150,7 @@ This switches between the 3.x (`current`) and 4.x (`future`) parsers.
150150
#### ordering
151151
Type | Default | Puppet Version(s)
152152
------ | -------------- | -----------------
153-
String | `"title-hash"` | 3.x, 4.x
153+
String | `"title-hash"` | 3.x, 4.x, 5.x
154154

155155
How unrelated resources should be ordered when applying a catalogue.
156156
* `manifest` - Use the order in which the resources are declared in the
@@ -162,7 +162,7 @@ How unrelated resources should be ordered when applying a catalogue.
162162
#### strict\_variables
163163
Type | Default | Puppet Version(s)
164164
------- | ------- | -----------------
165-
Boolean | `false` | 3.x, 4.x
165+
Boolean | `false` | 3.x, 4.x, 5.x
166166

167167
Makes Puppet raise an error when it tries to reference a variable that hasn't
168168
been defined (not including variables that have been explicitly set to
@@ -171,15 +171,15 @@ been defined (not including variables that have been explicitly set to
171171
#### stringify\_facts
172172
Type | Default | Puppet Version(s)
173173
------- | ------- | -----------------
174-
Boolean | `true` | 3.x, 4.x
174+
Boolean | `true` | 3.x, 4.x, 5.x
175175

176176
Makes rspec-puppet coerce all the fact values into strings (matching the
177177
behaviour of older versions of Puppet).
178178

179179
#### enable\_pathname\_stubbing
180180
Type | Default | Puppet Version(s)
181-
------- | ------- | -----------------
182-
Boolean |`false` | 2.x, 3.x, 4.x
181+
------- | ------- | ------------------
182+
Boolean |`false` | 2.x, 3.x, 4.x, 5.x
183183

184184
Configures rspec-puppet to stub out `Pathname#absolute?` with it's own
185185
implementation. This should only be enabled if you're running into an issue
@@ -188,8 +188,8 @@ functions, etc) that use `Pathname#absolute?`.
188188

189189
#### setup\_fixtures
190190
Type | Default | Puppet Version(s)
191-
------- | ------- | ---------------
192-
Boolean | `true` | 2.x, 3.x, 4.x
191+
------- | ------- | ------------------
192+
Boolean | `true` | 2.x, 3.x, 4.x, 5.x
193193

194194
Configures rspec-puppet to automatically create a link from the root of your
195195
module to `spec/fixtures/<module name>` at the beginning of the test run.

‎appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ branches:
77
# ruby versions under test
88
environment:
99
matrix:
10+
- RUBY_VERSION: 23-x64
11+
PUPPET_GEM_VERSION: '~> 5.0.0'
12+
- RUBY_VERSION: 21
13+
PUPPET_GEM_VERSION: '~> 5.0.0'
1014
- RUBY_VERSION: 23-x64
1115
PUPPET_GEM_VERSION: '~> 4.8.0'
1216
- RUBY_VERSION: 21
@@ -43,4 +47,4 @@ test_script:
4347

4448
notifications:
4549
email:
46-
- tim@bombasticmonkey.com
50+
- tim@sharpe.id.au

0 commit comments

Comments
 (0)