Skip to content

Commit 1d34b67

Browse files
sanfrancriskosanfrancrisko
authored
Merge pull request #1257 from puppetlabs/pdksync_simplecov
(MODULES-10120) enable simplecov; update to PDK 1.14.1; minor cleanups
2 parents 8089f73 + 9708275 commit 1d34b67

File tree

7 files changed

+111
-145
lines changed

7 files changed

+111
-145
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
2526
.envrc
2627
/inventory.yaml

‎.pdkignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
2526
.envrc
2627
/inventory.yaml
2728
/appveyor.yml

‎.project

-23
This file was deleted.

‎.sync.yml

+101-115
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,110 @@
11
---
2-
.gitignore:
3-
required:
4-
- ---.project
5-
6-
.travis.yml:
2+
".gitlab-ci.yml":
3+
delete: true
4+
".rubocop.yml":
5+
default_configs:
6+
inherit_from: ".rubocop_todo.yml"
7+
require:
8+
- rubocop-i18n
9+
- rubocop-rspec
10+
".travis.yml":
711
branches:
8-
- release
12+
- release
913
includes:
10-
-
11-
bundler_args:
12-
dist: trusty
13-
env: PLATFORMS=deb_puppet5
14-
rvm: 2.5.3
15-
before_script:
16-
- bundle exec rake 'litmus:provision_list[travis_deb]'
17-
- bundle exec rake 'litmus:install_agent[puppet5]'
18-
- bundle exec rake litmus:install_module
19-
script:
20-
- bundle exec rake litmus:acceptance:parallel
21-
services: docker
22-
sudo: required
23-
stage: acceptance
24-
-
25-
bundler_args:
26-
dist: trusty
27-
env: PLATFORM=deb_puppet6
28-
rvm: 2.5.3
29-
before_script:
30-
- bundle exec rake 'litmus:provision_list[travis_deb]'
31-
- bundle exec rake 'litmus:install_agent[puppet6]'
32-
- bundle exec rake litmus:install_module
33-
script:
34-
- bundle exec rake litmus:acceptance:parallel
35-
services: docker
36-
sudo: required
37-
stage: acceptance
38-
-
39-
bundler_args:
40-
dist: trusty
41-
env: PLATFORMS=el7_puppet5
42-
rvm: 2.5.3
43-
before_script:
44-
- bundle exec rake 'litmus:provision_list[travis_el7]'
45-
- bundle exec rake 'litmus:install_agent[puppet5]'
46-
- bundle exec rake litmus:install_module
47-
script:
48-
- bundle exec rake litmus:acceptance:parallel
49-
services: docker
50-
sudo: required
51-
stage: acceptance
52-
-
53-
bundler_args:
54-
dist: trusty
55-
env: PLATFORM=el7_puppet6
56-
rvm: 2.5.3
57-
before_script:
58-
- bundle exec rake 'litmus:provision_list[travis_el7]'
59-
- bundle exec rake 'litmus:install_agent[puppet6]'
60-
- bundle exec rake litmus:install_module
61-
script:
62-
- bundle exec rake litmus:acceptance:parallel
63-
services: docker
64-
sudo: required
65-
stage: acceptance
66-
-
67-
bundler_args:
68-
dist: trusty
69-
env: PLATFORMS=el6_puppet5
70-
rvm: 2.5.3
71-
before_script:
72-
- bundle exec rake 'litmus:provision_list[travis_el6]'
73-
- bundle exec rake 'litmus:install_agent[puppet5]'
74-
- bundle exec rake litmus:install_module
75-
script:
76-
- bundle exec rake litmus:acceptance:parallel
77-
services: docker
78-
sudo: required
79-
stage: acceptance
80-
-
81-
bundler_args:
82-
dist: trusty
83-
env: PLATFORMS=el6_puppet6
84-
rvm: 2.5.3
85-
before_script:
86-
- bundle exec rake 'litmus:provision_list[travis_el6]'
87-
- bundle exec rake 'litmus:install_agent[puppet6]'
88-
- bundle exec rake litmus:install_module
89-
script:
90-
- bundle exec rake litmus:acceptance:parallel
91-
services: docker
92-
sudo: required
93-
stage: acceptance
94-
14+
- bundler_args:
15+
dist: trusty
16+
env: PLATFORMS=deb_puppet5
17+
rvm: 2.5.3
18+
before_script:
19+
- bundle exec rake 'litmus:provision_list[travis_deb]'
20+
- bundle exec rake 'litmus:install_agent[puppet5]'
21+
- bundle exec rake litmus:install_module
22+
script:
23+
- bundle exec rake litmus:acceptance:parallel
24+
services: docker
25+
sudo: required
26+
stage: acceptance
27+
- bundler_args:
28+
dist: trusty
29+
env: PLATFORM=deb_puppet6
30+
rvm: 2.5.3
31+
before_script:
32+
- bundle exec rake 'litmus:provision_list[travis_deb]'
33+
- bundle exec rake 'litmus:install_agent[puppet6]'
34+
- bundle exec rake litmus:install_module
35+
script:
36+
- bundle exec rake litmus:acceptance:parallel
37+
services: docker
38+
sudo: required
39+
stage: acceptance
40+
- bundler_args:
41+
dist: trusty
42+
env: PLATFORMS=el7_puppet5
43+
rvm: 2.5.3
44+
before_script:
45+
- bundle exec rake 'litmus:provision_list[travis_el7]'
46+
- bundle exec rake 'litmus:install_agent[puppet5]'
47+
- bundle exec rake litmus:install_module
48+
script:
49+
- bundle exec rake litmus:acceptance:parallel
50+
services: docker
51+
sudo: required
52+
stage: acceptance
53+
- bundler_args:
54+
dist: trusty
55+
env: PLATFORM=el7_puppet6
56+
rvm: 2.5.3
57+
before_script:
58+
- bundle exec rake 'litmus:provision_list[travis_el7]'
59+
- bundle exec rake 'litmus:install_agent[puppet6]'
60+
- bundle exec rake litmus:install_module
61+
script:
62+
- bundle exec rake litmus:acceptance:parallel
63+
services: docker
64+
sudo: required
65+
stage: acceptance
66+
- bundler_args:
67+
dist: trusty
68+
env: PLATFORMS=el6_puppet5
69+
rvm: 2.5.3
70+
before_script:
71+
- bundle exec rake 'litmus:provision_list[travis_el6]'
72+
- bundle exec rake 'litmus:install_agent[puppet5]'
73+
- bundle exec rake litmus:install_module
74+
script:
75+
- bundle exec rake litmus:acceptance:parallel
76+
services: docker
77+
sudo: required
78+
stage: acceptance
79+
- bundler_args:
80+
dist: trusty
81+
env: PLATFORMS=el6_puppet6
82+
rvm: 2.5.3
83+
before_script:
84+
- bundle exec rake 'litmus:provision_list[travis_el6]'
85+
- bundle exec rake 'litmus:install_agent[puppet6]'
86+
- bundle exec rake litmus:install_module
87+
script:
88+
- bundle exec rake litmus:acceptance:parallel
89+
services: docker
90+
sudo: required
91+
stage: acceptance
92+
simplecov: true
93+
appveyor.yml:
94+
delete: true
9595
Gemfile:
9696
optional:
97-
':development':
98-
- gem: puppet-lint-i18n
99-
- gem: 'github_changelog_generator'
100-
git: 'https://github.com/skywinder/github-changelog-generator'
101-
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
102-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
103-
104-
appveyor.yml:
105-
unmanaged: true
106-
97+
":development":
98+
- gem: puppet-lint-i18n
99+
- gem: github_changelog_generator
100+
git: https://github.com/skywinder/github-changelog-generator
101+
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
102+
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
107103
Rakefile:
108104
requires:
109-
- puppet_pot_generator/rake_tasks
110-
  changelog_user: 'puppetlabs'
111-
105+
- puppet_pot_generator/rake_tasks
112106
spec/spec_helper.rb:
113107
spec_overrides:
114-
- "require 'spec_helper_local'"
115-
116-
.rubocop.yml:
117-
default_configs:
118-
inherit_from: .rubocop_todo.yml
119-
require:
120-
- rubocop-i18n
121-
- rubocop-rspec
122-
123-
.gitlab-ci.yml:
124-
unmanaged: true
108+
- require 'spec_helper_local'
109+
coverage_report: true
110+
"  changelog_user": puppetlabs

‎.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ before_install:
99
- gem --version
1010
- bundle -v
1111
script:
12-
- 'bundle exec rake $CHECK'
12+
- 'SIMPLECOV=yes bundle exec rake $CHECK'
1313
bundler_args: --without system_tests
1414
rvm:
1515
- 2.5.3
@@ -34,9 +34,6 @@ matrix:
3434
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
3535
rvm: 2.5.3
3636
stage: spec
37-
-
38-
env: DEPLOY_TO_FORGE=yes
39-
stage: deploy
4037
-
4138
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
4239
bundler_args:
@@ -97,6 +94,9 @@ matrix:
9794
services: docker
9895
stage: acceptance
9996
sudo: required
97+
-
98+
env: DEPLOY_TO_FORGE=yes
99+
stage: deploy
100100
branches:
101101
only:
102102
- master

‎metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383
],
8484
"description": "MySQL module",
85-
"template-url": "https://github.com/puppetlabs/pdk-templates/#master",
86-
"template-ref": "heads/master-0-g0e670e6",
87-
"pdk-version": "1.14.0"
85+
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
86+
"template-ref": "heads/master-0-gfaf9e8b",
87+
"pdk-version": "1.14.1"
8888
}

‎spec/spec_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
end
4040
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4141
c.after(:suite) do
42+
RSpec::Puppet::Coverage.report!(0)
4243
end
4344
end
4445

0 commit comments

Comments
 (0)