Skip to content

Commit cc7d9d0

Browse files
sanfrancriskosanfrancrisko
authored
Merge pull request puppetlabs#1068 from puppetlabs/pdksync_simplecov
(MODULES-10120) enable simplecov; update to PDK 1.14.1; minor cleanups
2 parents 1723e8e + f6f142e commit cc7d9d0

File tree

9 files changed

+111
-146
lines changed

9 files changed

+111
-146
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎.sync.yml‎

Lines changed: 102 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,117 @@
11
---
2-
.gitignore:
3-
required:
4-
- ---.project
5-
6-
.gitlab-ci.yml:
7-
unmanaged: true
8-
9-
.rubocop.yml:
2+
".gitlab-ci.yml":
3+
delete: true
4+
".rubocop.yml":
105
default_configs:
11-
inherit_from: .rubocop_todo.yml
12-
13-
.travis.yml:
6+
inherit_from: ".rubocop_todo.yml"
7+
".travis.yml":
148
dist: trusty
159
user: puppet
16-
secure: ""
10+
secure: ''
1711
branches:
18-
- release
12+
- release
1913
includes:
20-
-
21-
bundler_args:
22-
dist: trusty
23-
env: PLATFORMS=debian_puppet5
24-
rvm: 2.5.3
25-
before_script:
26-
- bundle exec rake 'litmus:provision_list[waffle_debian]'
27-
- bundle exec rake 'litmus:install_agent[puppet5]'
28-
- bundle exec rake litmus:install_module
29-
script:
30-
- bundle exec rake litmus:acceptance:parallel
31-
services: docker
32-
sudo: required
33-
stage: acceptance
34-
-
35-
bundler_args:
36-
dist: trusty
37-
env: PLATFORMS=debian_puppet6
38-
rvm: 2.5.3
39-
before_script:
40-
- bundle exec rake 'litmus:provision_list[waffle_debian]'
41-
- bundle exec rake 'litmus:install_agent[puppet6]'
42-
- bundle exec rake litmus:install_module
43-
script:
44-
- bundle exec rake litmus:acceptance:parallel
45-
services: docker
46-
sudo: required
47-
stage: acceptance
48-
-
49-
bundler_args:
50-
dist: trusty
51-
env: PLATFORMS=el6_puppet5
52-
rvm: 2.5.3
53-
before_script:
54-
- bundle exec rake 'litmus:provision_list[waffle_el6]'
55-
- bundle exec rake 'litmus:install_agent[puppet5]'
56-
- bundle exec rake litmus:install_module
57-
script:
58-
- bundle exec rake litmus:acceptance:parallel
59-
services: docker
60-
sudo: required
61-
stage: acceptance
62-
-
63-
bundler_args:
64-
dist: trusty
65-
env: PLATFORMS=el6_puppet6
66-
rvm: 2.5.3
67-
before_script:
68-
- bundle exec rake 'litmus:provision_list[waffle_el6]'
69-
- bundle exec rake 'litmus:install_agent[puppet6]'
70-
- bundle exec rake litmus:install_module
71-
script:
72-
- bundle exec rake litmus:acceptance:parallel
73-
services: docker
74-
sudo: required
75-
stage: acceptance
76-
-
77-
bundler_args:
78-
dist: trusty
79-
env: PLATFORMS=el7_puppet5
80-
rvm: 2.5.3
81-
before_script:
82-
- bundle exec rake 'litmus:provision_list[waffle_el7]'
83-
- bundle exec rake 'litmus:install_agent[puppet5]'
84-
- bundle exec rake litmus:install_module
85-
script:
86-
- bundle exec rake litmus:acceptance:parallel
87-
services: docker
88-
sudo: required
89-
stage: acceptance
90-
-
91-
bundler_args:
92-
dist: trusty
93-
env: PLATFORMS=el7_puppet6
94-
rvm: 2.5.3
95-
before_script:
96-
- bundle exec rake 'litmus:provision_list[waffle_el7]'
97-
- bundle exec rake 'litmus:install_agent[puppet6]'
98-
- bundle exec rake litmus:install_module
99-
script:
100-
- bundle exec rake litmus:acceptance:parallel
101-
services: docker
102-
sudo: required
103-
stage: acceptance
104-
14+
- bundler_args:
15+
dist: trusty
16+
env: PLATFORMS=debian_puppet5
17+
rvm: 2.5.3
18+
before_script:
19+
- bundle exec rake 'litmus:provision_list[waffle_debian]'
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: PLATFORMS=debian_puppet6
30+
rvm: 2.5.3
31+
before_script:
32+
- bundle exec rake 'litmus:provision_list[waffle_debian]'
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=el6_puppet5
43+
rvm: 2.5.3
44+
before_script:
45+
- bundle exec rake 'litmus:provision_list[waffle_el6]'
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: PLATFORMS=el6_puppet6
56+
rvm: 2.5.3
57+
before_script:
58+
- bundle exec rake 'litmus:provision_list[waffle_el6]'
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=el7_puppet5
69+
rvm: 2.5.3
70+
before_script:
71+
- bundle exec rake 'litmus:provision_list[waffle_el7]'
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=el7_puppet6
82+
rvm: 2.5.3
83+
before_script:
84+
- bundle exec rake 'litmus:provision_list[waffle_el7]'
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
10593
appveyor.yml:
10694
use_litmus: true
10795
matrix_extras:
108-
-
109-
RUBY_VERSION: 25-x64
110-
ACCEPTANCE: 'yes'
111-
TARGET_HOST: localhost
112-
-
113-
RUBY_VERSION: 25-x64
114-
ACCEPTANCE: 'yes'
115-
TARGET_HOST: localhost
116-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
117-
96+
- RUBY_VERSION: 25-x64
97+
ACCEPTANCE: 'yes'
98+
TARGET_HOST: localhost
99+
- RUBY_VERSION: 25-x64
100+
ACCEPTANCE: 'yes'
101+
TARGET_HOST: localhost
102+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
103+
simplecov: true
118104
Gemfile:
119105
use_litmus: true
120106
optional:
121-
':development':
122-
- gem: 'github_changelog_generator'
123-
git: 'https://github.com/skywinder/github-changelog-generator'
124-
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
125-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
126-
107+
":development":
108+
- gem: github_changelog_generator
109+
git: https://github.com/skywinder/github-changelog-generator
110+
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
111+
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
127112
Rakefile:
128113
requires:
129-
- puppet-lint/tasks/puppet-lint
130-
114+
- puppet-lint/tasks/puppet-lint
131115
spec/spec_helper.rb:
132-
mock_with: ':rspec'
116+
mock_with: ":rspec"
117+
coverage_report: true

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
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[waffle_debian]'", "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

‎Gemfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2-
gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master'
32

43
def location_for(place_or_version, fake_version = nil)
54
git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}

‎appveyor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ init:
1414
- 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
1515
- 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
1616
environment:
17+
SIMPLECOV: yes
1718
matrix:
1819
-
1920
RUBY_VERSION: 24-x64

‎metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@
107107
"description": "Standard Library for Puppet Modules",
108108
"pdk-version": "1.14.1",
109109
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
110-
"template-ref": "heads/master-0-g1a92949"
110+
"template-ref": "heads/master-0-gfaf9e8b"
111111
}

‎spec/spec_helper.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
end
4444
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4545
c.after(:suite) do
46+
RSpec::Puppet::Coverage.report!(0)
4647
end
4748
end
4849

0 commit comments

Comments
 (0)