Skip to content

Commit 520097c

Browse files
koshatulkoshatul
committed
merged master changes back in
2 parents 7feb835 + 23f89af commit 520097c

File tree

81 files changed

+3098
-547
lines changed

Some content is hidden

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

81 files changed

+3098
-547
lines changed

‎.fixtures.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +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": "git://github.com/puppetlabs/puppetlabs-facts.git"
7-
"puppet_agent": "git://github.com/puppetlabs/puppetlabs-puppet_agent.git"
8-
"provision": "git://github.com/puppetlabs/provision.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"
99
symlinks:
1010
"mysql": "#{source_dir}"

‎.github/workflows/release.yml

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

‎.github/workflows/weekly.yml

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: "weekly"
2+
3+
on:
4+
schedule:
5+
- cron: '0 5 * * 6'
6+
7+
jobs:
8+
LitmusAcceptance:
9+
env:
10+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
11+
HONEYCOMB_DATASET: litmus tests
12+
runs-on: self-hosted
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+
- name: Litmus Parallel
23+
uses: puppetlabs/action-litmus_parallel@master
24+
with:
25+
platform: ${{ matrix.platform }}
26+
agent_family: ${{ matrix.agent_family }}
27+
Spec:
28+
runs-on: self-hosted
29+
strategy:
30+
matrix:
31+
check: [parallel_spec, 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop']
32+
ruby_version: [2.5.x]
33+
puppet_gem_version: [~> 5.0, ~> 6.0]
34+
exclude:
35+
- puppet_gem_version: ~> 5.0
36+
check: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
37+
- ruby_version: 2.5.x
38+
puppet_gem_version: ~> 5.0
39+
steps:
40+
- uses: actions/checkout@v1
41+
- name: Spec Tests
42+
uses: puppetlabs/action-litmus_spec@master
43+
with:
44+
puppet_gem_version: ${{ matrix.puppet_gem_version }}
45+
check: ${{ matrix.check }}

‎.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.

‎.rubocop.yml

+11
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ GetText/DecorateString:
2727
Description: We don't want to decorate test output.
2828
Exclude:
2929
- spec/**/*
30+
Enabled: false
3031
RSpec/BeforeAfterAll:
3132
Description: Beware of using after(:all) as it may cause state to leak between tests.
3233
A necessary evil in acceptance testing.
@@ -39,6 +40,10 @@ Style/BlockDelimiters:
3940
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
4041
be consistent then.
4142
EnforcedStyle: braces_for_chaining
43+
Style/BracesAroundHashParameters:
44+
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
45+
See https://github.com/rubocop-hq/rubocop/pull/7643
46+
Enabled: true
4247
Style/ClassAndModuleChildren:
4348
Description: Compact style reduces the required amount of indentation.
4449
EnforcedStyle: compact
@@ -89,6 +94,12 @@ Style/MethodCalledOnDoEndBlock:
8994
Enabled: true
9095
Style/StringMethods:
9196
Enabled: true
97+
GetText/DecorateFunctionMessage:
98+
Enabled: false
99+
GetText/DecorateStringFormattingUsingInterpolation:
100+
Enabled: false
101+
GetText/DecorateStringFormattingUsingPercent:
102+
Enabled: false
92103
Layout/EndOfLine:
93104
Enabled: false
94105
Layout/IndentHeredoc:

‎.sync.yml

+40-31
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,47 @@
11
---
2-
.gitignore:
3-
required:
4-
- ---.project
5-
6-
.travis.yml:
7-
unmanaged: true
8-
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+
global_env:
12+
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
13+
deploy_to_forge:
14+
enabled: false
15+
branches:
16+
- release
17+
use_litmus: true
18+
litmus:
19+
provision_list:
20+
- travis_deb
21+
- travis_ub
22+
- travis_el6
23+
- travis_el7
24+
- ---travis_el
25+
simplecov: true
26+
notifications:
27+
slack:
28+
secure: XpBD602OXRZHSTDylzzx/OqpfThEJPbx0PLhXctWuES4GpW1EHWnyPgrliNOaJOh0Zb7qMrdaKWLOltfqPT5IanPd0XF7GbT8RrNeLTmLXqvHmC6dDqWxnvFvdSrGwqpj7s7Dbwl79nmszONRj1OlolPmJgY/2kGw88c71biaas=
29+
appveyor.yml:
30+
delete: true
931
Gemfile:
1032
optional:
11-
':development':
12-
- gem: puppet-lint-i18n
13-
- gem: 'github_changelog_generator'
14-
git: 'https://github.com/skywinder/github-changelog-generator'
15-
ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018'
16-
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')"
17-
18-
appveyor.yml:
19-
unmanaged: true
20-
33+
":development":
34+
- gem: puppet-lint-i18n
35+
- gem: github_changelog_generator
36+
git: https://github.com/skywinder/github-changelog-generator
37+
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
38+
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
39+
- gem: puppet-resource_api
2140
Rakefile:
2241
requires:
23-
- puppet_pot_generator/rake_tasks
24-
  changelog_user: 'puppetlabs'
25-
42+
- puppet_pot_generator/rake_tasks
2643
spec/spec_helper.rb:
2744
spec_overrides:
28-
- "require 'spec_helper_local'"
29-
30-
.rubocop.yml:
31-
default_configs:
32-
inherit_from: .rubocop_todo.yml
33-
require:
34-
- rubocop-i18n
35-
- rubocop-rspec
36-
37-
.gitlab-ci.yml:
38-
unmanaged: true
45+
- require 'spec_helper_local'
46+
coverage_report: true
47+
"  changelog_user": puppetlabs

0 commit comments

Comments
 (0)