Skip to content

Commit

Permalink
Merge branch 'example42:master' into dagobert-asterisk
Browse files Browse the repository at this point in the history
  • Loading branch information
dagobert authored Jun 12, 2024
2 parents 4ddda47 + 87730d6 commit 32c0cec
Show file tree
Hide file tree
Showing 1,400 changed files with 10,888 additions and 2,741 deletions.
12 changes: 12 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
fixtures:
repositories:
"concat": "https://github.com/puppetlabs/puppetlabs-concat.git"
"vcsrepo": "https://github.com/puppetlabs/puppetlabs-vcsrepo.git"
"tp_profile": "https://github.com/example42/puppet-tp_profile.git"
"psick_profile": "https://github.com/example42/psick_profile.git"
"tp": "https://github.com/example42/puppet-tp.git"
"psick": "https://github.com/example42/puppet-psick.git"
"yumrepo": "https://github.com/puppetlabs/puppetlabs-yumrepo_core"
forge_modules:
stdlib: "puppetlabs/stdlib"
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf
39 changes: 20 additions & 19 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
## How to Contribute to This Project

#### **Did You Find a Bug?**
### Bug found

* **Ensure the bug was not already reported** by searching on GitHub under **Issues**.
* If you're unable to find an open issue addressing the problem, **open a new one**. Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
- **Ensure the bug was not already reported** by searching on GitHub under **Issues**.
- If you're unable to find an open issue addressing the problem, **open a new one**. Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.

#### **Did You Write a Patch That Fixes a Bug?**
### Submit a patch

* Open a new GitHub pull request with the patch.
1. Fork this project
1. Create your feature branch: `git checkout -b my-new-feature`
1. Commit your changes: `git commit -am 'Add some feature'`
1. Push to the branch: `git push origin my-new-feature`
1. Submit a pull request via GitHub's web interface
* Ensure the PR description clearly describes the problem and its solution. Include the relevant issue number if applicable.
- Open a new GitHub pull request with the patch.
1. Fork this project
2. Create your feature branch: `git checkout -b my-new-feature`
3. Commit your changes: `git commit -am 'Add some feature'`
4. Push to the branch: `git push origin my-new-feature`
5. Submit a pull request via GitHub's web interface

#### **Do You Intend to Add a New Feature or Change an Existing One?**
- Ensure the PR description clearly describes the problem and its solution. Include the relevant issue number if applicable.

* Suggest your change as a **new issue** using the label `enhancement` **BEFORE** you start writing code.
### Request feature

#### **Do You Want to Sponsor Open Source Development?**
- Suggest your change as a **new issue** using the label `enhancement` **BEFORE** you start writing code.

### Sponsor Open Source Development

If you need express resolution of a bug or new features you can consider the opportunity of **sponsoring** the relevant development.
* Open an issue on GitHub (of type `bug` or `enhancement`) with the details of what you want
* Contact [example42](http://www.example42.com/#contact) referring the issue you created
* Tell us how you want to sponsor the development (sending money, gifts or offering services)
* If we agree on the conditions we will place your [company] name in the module's Sponsors List

- Open an issue on GitHub (of type `bug` or `enhancement`) with the details of what you want
- Contact [example42](https://www.example42.com/) referring the issue you created
- Tell us how you want to sponsor the development (sending money, gifts or offering services)
- If we agree on the conditions we will place your company name in the module's Sponsors List

Thanks for contributing! :heart:
22 changes: 8 additions & 14 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
## Expected Behavior
# Your tp request

Application to manage (new or to fix):
Operating System(s) to support:
Installation Method(s):

## Actual Behavior
## Labels

Please use the following labels:

## Steps to Reproduce the Problem
* **tinydata request** for any request for new or updated tinydata for an application
* **questions** for any error you find, doubt or clarification request

1.
1.
1.

## Specifications

Please add this info:

1. Output of ```facter -p``` on the failing node (at least the OS related facts)
1. Version of Puppet and of the module
1. The relevant Puppet code and eventually Hiera data
13 changes: 6 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
## Before submitting your PR

1. Open an **issue** and refer to its number in your PR title
1. If it's a bug and you have the solution, go on with the PR!
1. If it's an enhancement, please wait for our feedback before starting to work on it
1. Please run ```puppet-lint``` on your code and ensure it's compliant
1. Open an **issue** and refer to its number in your PR title
2. If it's a bug and you have the solution, go on with the PR!
3. If it's an enhancement, please wait for our feedback before starting to work on it
4. Please run `puppet-lint` on your code and ensure it's compliant

## After submitting your PR

1. Verify Travis checks and eventually fix the errors
1. Feel free to ping us if we don't reply promptly

1. Verify Travis checks and eventually fix the errors
2. Feel free to ping us if we don't reply promptly
56 changes: 56 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
name: PR tests
on: pull_request # yamllint disable-line rule:truthy

jobs:
validate-yaml:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Validate YAML files
run: yamllint .

acceptance:
strategy:
matrix:
include:
# - container: example42/tiny-puppet-ubuntu1804
- container: example42/tiny-puppet-ubuntu2004
- container: example42/tiny-puppet-ubuntu2204
- container: example42/tiny-puppet-debian11
- container: example42/tiny-puppet-debian10
# - container: example42/tiny-puppet-debian9
# - container: example42/tiny-puppet-debian8
- container: example42/tiny-puppet-rockylinux9
- container: example42/tiny-puppet-rockylinux8
- container: example42/tiny-puppet-almalinux9
- container: example42/tiny-puppet-almalinux8
- container: example42/tiny-puppet-redhat9
- container: example42/tiny-puppet-redhat8
# - container: example42/tiny-puppet-centos7
# - container: example42/tiny-puppet-centos6
runs-on: ubuntu-latest
container:
image: ${{ matrix.container }}
options: --user root
name: "Acceptance test on ${{ matrix.container }}"
timeout-minutes: 60
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Git config safe directory
run: git config --global --add safe.directory /__w/tinydata/tinydata
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
- name: Run tp tests
run: scripts/github_tp_test.sh "${{ steps.changed-files.outputs.all_changed_files }}"
shell: 'script -q -e -c "bash {0}"'
if: success() || failure()
- name: 'Upload results artifact'
uses: actions/upload-artifact@v3
with:
name: my-artifact
path: results.txt
retention-days: 5
25 changes: 25 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Release

on: # yamllint disable-line rule:truthy
push:
tags:
- '*'

env:
BUNDLE_WITHOUT: development:test:system_tests

jobs:
deploy:
name: 'Deploy to forge'
runs-on: ubuntu-latest
if: github.repository_owner == 'example42'
container: puppet/puppet-dev-tools:2022-11-14-8e11537
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Publish to the Forge
run: /usr/local/bin/pdk bundle exec rake module:push
env:
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
46 changes: 28 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
/.idea
/.gradle
/.rvmrc
build
pkg/
coverage/
Session.vim
spec/fixtures
.*.sw[a-z]
Gemfile.lock
*.un~
/.vagrant
/vagrant/modules/public
.coveralls.yml
.bundle/
.yardoc/
doc/
vendor/
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/results.txt
42 changes: 42 additions & 0 deletions .pdkignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/appveyor.yml
/.fixtures.yml
/Gemfile
/.gitattributes
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/.yardopts
/spec/
/.vscode/
1 change: 1 addition & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--relative
2 changes: 2 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--color
--format progress
29 changes: 29 additions & 0 deletions .yamllint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# to update some defaults during the actions run
rules:
braces: enable
brackets: enable
colons: enable
commas: enable
comments:
level: warning
comments-indentation:
level: warning
document-end: disable
document-start:
level: warning
empty-lines: disable
empty-values: disable
float-values: disable
hyphens: enable
indentation: enable
key-duplicates: enable
key-ordering: disable
line-length: disable
new-line-at-end-of-file: disable
new-lines: disable
octal-values: disable
quoted-strings: disable
trailing-spaces: enable
truthy:
level: warning
1 change: 1 addition & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--markup markdown
Loading

0 comments on commit 32c0cec

Please sign in to comment.