Skip to content

Commit 32b6036

Browse files
authored
Merge pull request #537 from DataDog/albertvaka/puppet-6
Support puppet 6
2 parents 3aace51 + d1020e6 commit 32b6036

3 files changed

Lines changed: 32 additions & 9 deletions

File tree

.fixtures.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ fixtures:
1313
repo: "git://github.com/puppetlabs/puppetlabs-puppetserver_gem.git"
1414
ref: "1.0.0"
1515
ruby: "git://github.com/puppetlabs/puppetlabs-ruby.git"
16+
forge_modules:
17+
yumrepo_core: "puppetlabs/yumrepo_core"
1618
symlinks:
1719
custom_datadog: "#{source_dir}/spec/custom_fixtures/custom_datadog"
1820
datadog_agent: "#{source_dir}"

.travis.yml

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,32 @@ rvm:
77
- 2.2.3
88
- 2.3.6
99
- 2.4.3
10+
- 2.6.3
1011
script:
1112
- bundle exec rake test
1213
env:
13-
- PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
14-
- PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
15-
- PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
16-
- PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
17-
- PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
18-
- PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
19-
- PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
20-
- PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
21-
- PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
14+
global:
15+
- STRICT_VARIABLES=yes
16+
matrix:
17+
- PUPPET_VERSION="~> 4.6.2"
18+
- PUPPET_VERSION="~> 4.7.1"
19+
- PUPPET_VERSION="~> 4.8.2"
20+
- PUPPET_VERSION="~> 4.9.4"
21+
- PUPPET_VERSION="~> 4.10.9"
22+
- PUPPET_VERSION="~> 5.0.1"
23+
- PUPPET_VERSION="~> 5.1.0"
24+
- PUPPET_VERSION="~> 5.2.0"
25+
- PUPPET_VERSION="~> 5.3.3"
26+
- PUPPET_VERSION="~> 6.0.0"
27+
- PUPPET_VERSION="~> 6.5.0"
28+
matrix:
29+
exclude:
30+
# Puppet 6 needs ruby 2.3+
31+
- rvm: 2.1.9
32+
env: PUPPET_VERSION="~> 6.0.0"
33+
- rvm: 2.1.9
34+
env: PUPPET_VERSION="~> 6.5.0"
35+
- rvm: 2.2.3
36+
env: PUPPET_VERSION="~> 6.0.0"
37+
- rvm: 2.2.3
38+
env: PUPPET_VERSION="~> 6.5.0"

metadata.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
{
4343
"name": "puppet",
4444
"version_requirement": ">=4.6.0 <7.0.0"
45+
},
46+
{
47+
"name": "yumrepo_core",
48+
"version_requirement": ">=1.0.3 < 2.0.0"
4549
}
4650
],
4751
"dependencies": [

0 commit comments

Comments
 (0)