Skip to content

Commit 010414d

Browse files
SpuffnduffSpuffnduff
authored
Merge branch 'master' into patch-1
2 parents af6f2b5 + cbef479 commit 010414d

File tree

78 files changed

+2352
-1149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2352
-1149
lines changed

‎.fixtures.yml

+3
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ fixtures:
33
"stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib"
44
"translate": "https://github.com/puppetlabs/puppetlabs-translate"
55
"cron_core": "https://github.com/puppetlabs/puppetlabs-cron_core.git"
6+
"facts": "https://github.com/puppetlabs/puppetlabs-facts.git"
7+
"puppet_agent": "https://github.com/puppetlabs/puppetlabs-puppet_agent.git"
8+
"provision": "https://github.com/puppetlabs/provision.git"
69
symlinks:
710
"mysql": "#{source_dir}"

‎.github/workflows/release.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: "release"
2+
3+
on:
4+
push:
5+
branches:
6+
- 'release'
7+
8+
jobs:
9+
LitmusAcceptance:
10+
11+
runs-on: self-hosted
12+
13+
strategy:
14+
matrix:
15+
ruby_version: [2.5.x]
16+
puppet_gem_version: [~> 6.0]
17+
platform: [release_checks]
18+
agent_family: ['puppet5', 'puppet6']
19+
20+
steps:
21+
- uses: actions/checkout@v1
22+
23+
- name: Litmus Parallel
24+
uses: puppetlabs/action-litmus_parallel@master
25+
with:
26+
platform: ${{ matrix.platform }}
27+
agent_family: ${{ matrix.agent_family }}
28+
29+
Spec:
30+
runs-on: self-hosted
31+
32+
strategy:
33+
matrix:
34+
check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
35+
ruby_version: [2.5.x]
36+
puppet_gem_version: [~> 5.0, ~> 6.0]
37+
exclude:
38+
- puppet_gem_version: ~> 5.0
39+
check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
40+
- ruby_version: 2.5.x
41+
puppet_gem_version: ~> 5.0
42+
43+
steps:
44+
- uses: actions/checkout@v1
45+
46+
- name: Spec Tests
47+
uses: puppetlabs/action-litmus_spec@master
48+
with:
49+
puppet_gem_versionm: ${{ matrix.puppet_gem_version }}
50+
check: ${{ matrix.check }}

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml

‎.pdkignore

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml
2528
/appveyor.yml
2629
/.fixtures.yml
2730
/Gemfile
@@ -30,8 +33,10 @@
3033
/.gitlab-ci.yml
3134
/.pdkignore
3235
/Rakefile
36+
/rakelib/
3337
/.rspec
3438
/.rubocop.yml
3539
/.travis.yml
3640
/.yardopts
3741
/spec/
42+
/.vscode/

‎.project

-23
This file was deleted.

‎.puppet-lint.rc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--relative

‎.rubocop.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
require:
3-
- rubocop-i18n
43
- rubocop-rspec
4+
- rubocop-i18n
55
AllCops:
66
DisplayCopNames: true
77
TargetRubyVersion: '2.1'
@@ -21,10 +21,13 @@ AllCops:
2121
Metrics/LineLength:
2222
Description: People have wide screens, use them.
2323
Max: 200
24+
GetText:
25+
Enabled: false
2426
GetText/DecorateString:
2527
Description: We don't want to decorate test output.
2628
Exclude:
27-
- spec/*
29+
- spec/**/*
30+
Enabled: false
2831
RSpec/BeforeAfterAll:
2932
Description: Beware of using after(:all) as it may cause state to leak between tests.
3033
A necessary evil in acceptance testing.
@@ -87,6 +90,12 @@ Style/MethodCalledOnDoEndBlock:
8790
Enabled: true
8891
Style/StringMethods:
8992
Enabled: true
93+
GetText/DecorateFunctionMessage:
94+
Enabled: false
95+
GetText/DecorateStringFormattingUsingInterpolation:
96+
Enabled: false
97+
GetText/DecorateStringFormattingUsingPercent:
98+
Enabled: false
9099
Layout/EndOfLine:
91100
Enabled: false
92101
Layout/IndentHeredoc:

‎.sync.yml

+104-44
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,112 @@
11
---
2-
.travis.yml:
3-
docker_sets:
4-
- set: docker/centos-7
5-
- set: docker/ubuntu-14.04
6-
docker_defaults:
7-
bundler_args: ""
8-
secure: ""
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":
11+
deploy_to_forge:
12+
enabled: false
913
branches:
10-
- release
11-
14+
- release
15+
includes:
16+
- bundler_args:
17+
dist: trusty
18+
env: PLATFORMS=deb_puppet5
19+
rvm: 2.5.3
20+
before_script:
21+
- bundle exec rake 'litmus:provision_list[travis_deb]'
22+
- bundle exec rake 'litmus:install_agent[puppet5]'
23+
- bundle exec rake litmus:install_module
24+
script:
25+
- bundle exec rake litmus:acceptance:parallel
26+
services: docker
27+
sudo: required
28+
stage: acceptance
29+
- bundler_args:
30+
dist: trusty
31+
env: PLATFORM=deb_puppet6
32+
rvm: 2.5.3
33+
before_script:
34+
- bundle exec rake 'litmus:provision_list[travis_deb]'
35+
- bundle exec rake 'litmus:install_agent[puppet6]'
36+
- bundle exec rake litmus:install_module
37+
script:
38+
- bundle exec rake litmus:acceptance:parallel
39+
services: docker
40+
sudo: required
41+
stage: acceptance
42+
- bundler_args:
43+
dist: trusty
44+
env: PLATFORMS=el7_puppet5
45+
rvm: 2.5.3
46+
before_script:
47+
- bundle exec rake 'litmus:provision_list[travis_el7]'
48+
- bundle exec rake 'litmus:install_agent[puppet5]'
49+
- bundle exec rake litmus:install_module
50+
script:
51+
- bundle exec rake litmus:acceptance:parallel
52+
services: docker
53+
sudo: required
54+
stage: acceptance
55+
- bundler_args:
56+
dist: trusty
57+
env: PLATFORM=el7_puppet6
58+
rvm: 2.5.3
59+
before_script:
60+
- bundle exec rake 'litmus:provision_list[travis_el7]'
61+
- bundle exec rake 'litmus:install_agent[puppet6]'
62+
- bundle exec rake litmus:install_module
63+
script:
64+
- bundle exec rake litmus:acceptance:parallel
65+
services: docker
66+
sudo: required
67+
stage: acceptance
68+
- bundler_args:
69+
dist: trusty
70+
env: PLATFORMS=el6_puppet5
71+
rvm: 2.5.3
72+
before_script:
73+
- bundle exec rake 'litmus:provision_list[travis_el6]'
74+
- bundle exec rake 'litmus:install_agent[puppet5]'
75+
- bundle exec rake litmus:install_module
76+
script:
77+
- bundle exec rake litmus:acceptance:parallel
78+
services: docker
79+
sudo: required
80+
stage: acceptance
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+
simplecov: true
95+
appveyor.yml:
96+
delete: true
1297
Gemfile:
13-
required:
14-
':system_tests':
15-
- gem: 'puppet-module-posix-system-r#{minor_version}'
16-
platforms: ruby
17-
- gem: 'puppet-module-win-system-r#{minor_version}'
18-
platforms:
19-
- mswin
20-
- mingw
21-
- x64_mingw
22-
- gem: beaker-testmode_switcher
23-
':development':
24-
- gem: puppet-lint-i18n
2598
optional:
26-
':development':
27-
- gem: 'github_changelog_generator'
28-
git: 'https://github.com/skywinder/github-changelog-generator'
29-
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
30-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
31-
32-
appveyor.yml:
33-
unmanaged: true
34-
99+
":development":
100+
- gem: puppet-lint-i18n
101+
- gem: github_changelog_generator
102+
git: https://github.com/skywinder/github-changelog-generator
103+
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
104+
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
35105
Rakefile:
36106
requires:
37-
- puppet_pot_generator/rake_tasks
38-
  changelog_user: 'puppetlabs'
39-
107+
- puppet_pot_generator/rake_tasks
40108
spec/spec_helper.rb:
41109
spec_overrides:
42-
- "require 'spec_helper_local'"
43-
44-
.rubocop.yml:
45-
default_configs:
46-
inherit_from: .rubocop_todo.yml
47-
require:
48-
- rubocop-i18n
49-
- rubocop-rspec
50-
51-
.gitlab-ci.yml:
52-
unmanaged: true
110+
- require 'spec_helper_local'
111+
coverage_report: true
112+
"  changelog_user": puppetlabs

0 commit comments

Comments
 (0)