Skip to content

Commit 4010931

Browse files
Ramesh7Ramesh7
authored
Merge branch 'main' into migration
2 parents bf27a91 + 21ebaa6 commit 4010931

33 files changed

+555
-467
lines changed

‎.editorconfig

-15
This file was deleted.

‎.fixtures.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
fixtures:
22
repositories:
3-
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib
3+
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
4+
puppet_agent:
5+
repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
6+
ref: v4.13.0
7+
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
8+
powershell: https://github.com/puppetlabs/puppetlabs-powershell.git
9+
provision: 'https://github.com/puppetlabs/provision.git'

‎.github/ISSUE_TEMPLATE.md

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
<!--
2-
Thank you for contributing to this project!
3-
4-
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
5-
- Please check that here is no existing issue or PR that addresses your problem.
6-
- Please fill the following form to enable us to help you.
7-
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
8-
9-
-->
10-
111
## Affected Puppet, Ruby, OS and module versions/distributions
122

133
- Puppet:

‎.github/PULL_REQUEST_TEMPLATE.md

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
<!--
2-
Thank you for contributing to this project!
1+
## Summary
2+
Provide a detailed description of all the changes present in this pull request.
33

4-
- This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
5-
- Please check that here is no existing issue or PR that addresses your problem.
6-
- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
4+
## Additional Context
5+
Add any additional context about the problem here.
6+
- [ ] Root cause and the steps to reproduce. (If applicable)
7+
- [ ] Thought process behind the implementation.
78

8-
-->
9-
#### Pull Request (PR) description
10-
<!--
11-
Replace this comment with a description of your pull request.
12-
-->
9+
## Related Issues (if any)
10+
Mention any related issues or pull requests.
1311

14-
#### This Pull Request (PR) fixes the following issues
15-
<!--
16-
Replace this comment with the list of issues or n/a.
17-
Use format:
18-
Fixes #123
19-
Fixes #124
20-
-->
12+
## Checklist
13+
- [ ] 🟢 Spec tests.
14+
- [ ] 🟢 Acceptance tests.
15+
- [ ] Manually verified.

‎.github/workflows/ci.yml

+13-62
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,17 @@
1-
---
2-
# Managed by modulesync - DO NOT EDIT
3-
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
1+
name: "ci"
42

5-
name: CI
6-
7-
on: pull_request
8-
9-
concurrency:
10-
group: ${{ github.head_ref }}
11-
cancel-in-progress: true
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
workflow_dispatch:
128

139
jobs:
14-
setup_matrix:
15-
name: 'Setup Test Matrix'
16-
runs-on: ubuntu-latest
17-
timeout-minutes: 40
18-
outputs:
19-
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
20-
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
21-
env:
22-
BUNDLE_WITHOUT: development:system_tests:release
23-
steps:
24-
- uses: actions/checkout@v2
25-
- name: Setup ruby
26-
uses: ruby/setup-ruby@v1
27-
with:
28-
ruby-version: '3.0'
29-
bundler-cache: true
30-
- name: Run static validations
31-
run: bundle exec rake validate lint check
32-
- name: Run rake rubocop
33-
run: bundle exec rake rubocop
34-
- name: Setup Test Matrix
35-
id: get-outputs
36-
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
37-
38-
unit:
39-
needs: setup_matrix
40-
runs-on: ubuntu-latest
41-
timeout-minutes: 40
42-
strategy:
43-
fail-fast: false
44-
matrix:
45-
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
46-
env:
47-
BUNDLE_WITHOUT: development:system_tests:release
48-
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
49-
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
50-
steps:
51-
- uses: actions/checkout@v2
52-
- name: Setup ruby
53-
uses: ruby/setup-ruby@v1
54-
with:
55-
ruby-version: ${{ matrix.ruby }}
56-
bundler-cache: true
57-
- name: Run tests
58-
run: bundle exec rake parallel_spec
10+
Spec:
11+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
12+
secrets: "inherit"
5913

60-
tests:
61-
needs:
62-
- unit
63-
runs-on: ubuntu-latest
64-
name: Test suite
65-
steps:
66-
- run: echo Test suite completed
14+
Acceptance:
15+
needs: Spec
16+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
17+
secrets: "inherit"

‎.github/workflows/labeller.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Labeller
2+
3+
on:
4+
issues:
5+
types:
6+
- opened
7+
- labeled
8+
- unlabeled
9+
pull_request_target:
10+
types:
11+
- opened
12+
- labeled
13+
- unlabeled
14+
15+
jobs:
16+
label:
17+
runs-on: ubuntu-latest
18+
steps:
19+
20+
- uses: puppetlabs/[email protected]
21+
name: Label issues or pull requests
22+
with:
23+
label_name: community
24+
label_color: '5319e7'
25+
org_membership: puppetlabs
26+
fail_if_member: 'true'
27+
token: ${{ secrets.IAC_COMMUNITY_LABELER }}

‎.github/workflows/mend.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "mend"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "main"
7+
schedule:
8+
- cron: "0 0 * * *"
9+
workflow_dispatch:
10+
11+
jobs:
12+
13+
mend:
14+
uses: "puppetlabs/cat-github-actions/.github/workflows/mend_ruby.yml@main"
15+
secrets: "inherit"

‎.github/workflows/nightly.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: "nightly"
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
Spec:
10+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_ci.yml@main"
11+
secrets: "inherit"
12+
13+
Acceptance:
14+
needs: Spec
15+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
16+
secrets: "inherit"

‎.github/workflows/release.yml

+5-30
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,9 @@
1-
---
2-
# Managed by modulesync - DO NOT EDIT
3-
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4-
5-
name: Release
1+
name: "Publish module"
62

73
on:
8-
push:
9-
tags:
10-
- '*'
11-
12-
env:
13-
BUNDLE_WITHOUT: development:test:system_tests
4+
workflow_dispatch:
145

156
jobs:
16-
deploy:
17-
name: 'deploy to forge'
18-
runs-on: ubuntu-latest
19-
if: github.repository_owner == 'voxpupuli'
20-
steps:
21-
- name: Checkout repository
22-
uses: actions/checkout@v2
23-
- name: Setup Ruby
24-
uses: ruby/setup-ruby@v1
25-
with:
26-
ruby-version: '2.7'
27-
bundler-cache: true
28-
- name: Build and Deploy
29-
env:
30-
# Configure secrets here:
31-
# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
32-
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
33-
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
34-
run: bundle exec rake module:push
7+
release:
8+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"
9+
secrets: "inherit"

‎.github/workflows/release_prep.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: "Release Prep"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: "Module version to be released. Must be a valid semver string. (1.2.3)"
8+
required: true
9+
10+
jobs:
11+
release_prep:
12+
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release_prep.yml@main"
13+
with:
14+
version: "${{ github.event.inputs.version }}"
15+
secrets: "inherit"

‎.gitignore

+27-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
# Managed by modulesync - DO NOT EDIT
2-
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3-
4-
pkg/
5-
Gemfile.lock
6-
Gemfile.local
7-
vendor/
8-
.vendor/
9-
spec/fixtures/manifests/
10-
spec/fixtures/modules/
11-
.vagrant/
12-
.bundle/
13-
.ruby-version
14-
coverage/
15-
log/
16-
.idea/
17-
.dependencies/
18-
.librarian/
19-
Puppetfile.lock
1+
.git/
2+
.*.sw[op]
3+
.metadata
4+
.yardoc
5+
.yardwarns
206
*.iml
21-
.*.sw?
22-
.yardoc/
23-
Guardfile
7+
/.bundle/
8+
/.idea/
9+
/.vagrant/
10+
/coverage/
11+
/bin/
12+
/doc/
13+
/Gemfile.local
14+
/Gemfile.lock
15+
/junit/
16+
/log/
17+
/pkg/
18+
/spec/fixtures/manifests/
19+
/spec/fixtures/modules/
20+
/tmp/
21+
/vendor/
22+
/convert_report.txt
23+
/update_report.txt
24+
.DS_Store
25+
.project
26+
.envrc
27+
/inventory.yaml
28+
/spec/fixtures/litmus_inventory.yaml

‎.msync.yml

-5
This file was deleted.

‎.overcommit.yml

-65
This file was deleted.

0 commit comments

Comments
 (0)