Skip to content

Commit 43a4eaa

Browse files
Merge pull request #277 from ThoughtCrhyme/MODULES-7833
(MODULES-7833) Update metadata for Puppet 6
2 parents b329064 + 9efd29a commit 43a4eaa

File tree

4 files changed

+55
-32
lines changed

4 files changed

+55
-32
lines changed

.sync.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ spec/default_facts.yml:
2525
unmanaged: true
2626

2727
appveyor.yml:
28-
unmanaged: true
28+
matrix_extras:
29+
- PUPPET_GEM_VERSION: ~> 6.0
30+
RUBY_VERSION: 25
31+
CHECK: parallel_spec
32+
- PUPPET_GEM_VERSION: ~> 6.0
33+
RUBY_VERSION: 25-x64
34+
CHECK: parallel_spec
35+
2936
.gitlab-ci.yml:
3037
delete: true
3138

Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ group :development do
3535
gem "puppet-module-win-dev-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
3636
end
3737
group :system_tests do
38-
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
39-
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
40-
gem "beaker-testmode_switcher", '~> 0.4', require: false
41-
gem "master_manipulator", require: false
42-
gem "puppet-blacksmith", '~> 3.4', require: false
38+
gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby]
39+
gem "puppet-module-win-system-r#{minor_version}", require: false, platforms: [:mswin, :mingw, :x64_mingw]
40+
gem "beaker-testmode_switcher", '~> 0.4', require: false
41+
gem "master_manipulator", require: false
42+
gem "puppet-blacksmith", '~> 3.4', require: false
4343
end
4444

4545
puppet_version = ENV['PUPPET_GEM_VERSION']

appveyor.yml

+41-25
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,50 @@ init:
1010
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
1111
environment:
1212
matrix:
13-
- PUPPET_GEM_VERSION: ~> 4.0
14-
RUBY_VER: 21
15-
- PUPPET_GEM_VERSION: ~> 4.0
16-
RUBY_VER: 21-x64
17-
- PUPPET_GEM_VERSION: ~> 5.0
18-
RUBY_VER: 24
19-
- PUPPET_GEM_VERSION: ~> 5.0
20-
RUBY_VER: 24-x64
21-
- PUPPET_GEM_VERSION: 4.7.1
22-
RUBY_VER: 21-x64
13+
-
14+
RUBY_VERSION: 24-x64
15+
CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
16+
-
17+
PUPPET_GEM_VERSION: ~> 4.0
18+
RUBY_VERSION: 21
19+
CHECK: parallel_spec
20+
-
21+
PUPPET_GEM_VERSION: ~> 4.0
22+
RUBY_VERSION: 21-x64
23+
CHECK: parallel_spec
24+
-
25+
PUPPET_GEM_VERSION: ~> 5.0
26+
RUBY_VERSION: 24
27+
CHECK: parallel_spec
28+
-
29+
PUPPET_GEM_VERSION: ~> 5.0
30+
RUBY_VERSION: 24-x64
31+
CHECK: parallel_spec
32+
-
33+
PUPPET_GEM_VERSION: ~> 6.0
34+
RUBY_VERSION: 25
35+
CHECK: parallel_spec
36+
-
37+
PUPPET_GEM_VERSION: ~> 6.0
38+
RUBY_VERSION: 25-x64
39+
CHECK: parallel_spec
2340
matrix:
2441
fast_finish: true
2542
install:
26-
- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
27-
- ps: |
28-
gem list openssl
29-
ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"'
30-
- bundle install --jobs 4 --retry 2 --without system_tests
31-
- type Gemfile.lock
43+
- set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
44+
- bundle install --jobs 4 --retry 2 --without system_tests
45+
- type Gemfile.lock
3246
build: off
3347
test_script:
34-
- bundle exec puppet -V
35-
- ruby -v
36-
- bundle exec rake spec SPEC_OPTS='--format documentation'
48+
- bundle exec puppet -V
49+
- ruby -v
50+
- gem -v
51+
- bundle -v
52+
- bundle exec rake %CHECK%
3753
notifications:
38-
- provider: Email
39-
to:
40-
41-
on_build_success: false
42-
on_build_failure: false
43-
on_build_status_changed: false
54+
- provider: Email
55+
to:
56+
57+
on_build_success: false
58+
on_build_failure: false
59+
on_build_status_changed: false

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"requirements": [
2727
{
2828
"name": "puppet",
29-
"version_requirement": ">=4.7.0 < 6.0.0"
29+
"version_requirement": ">=4.7.0 < 7.0.0"
3030
}
3131
],
3232
"tags": [

0 commit comments

Comments
 (0)