Skip to content

Commit b8c1547

Browse files
benjamin-robertsonbaile320
benjamin-robertson
and
baile320
authored
Version 3.0.0 (#16)
* add todos * we accept this as a variable so we should respect it * remove commented out code * no passwords in the data files * Push to github * specifically specify our database * escape the password just in case * empty commit * try this syntax * empty commit * remote can't add users * remove todo * Push integration tests * export * export vars * check inventory * try running task directly * test with location * commit changes * push changes * Control snmp listen in observium * disable ipv6 * Commit run in github action * try with provision litmus * Run integration tests * Install the module too!!! * Switch to provision.yaml * Move provision yaml * Remove centos7 add ubuntu * add puppet facts * remove do * with os family * lowercase strings * Fix serverspec * added more checks * describe not descrube * Try with other " * Test again * remove sed * Test with snmp v6 listen enabled * set override * Setup vagrant images * added unit tests * test unit tests * Commit latest unit tests * fix some lint issues * added lint tests * remove old plan * Update reference.md * Add lint test * update name * Fix lint, disable ubuntu 20.04 litmus * added cron serverspec entry * Added more tests * check os release * Fix variable and cron * Updated serverspec * Test curl * test with should * with full path * Test with stdout * test with simple command * attempt with new syntax * with match * test * revert * with quotes * Restore code * Disable breaking test * added centos7 image * Added stream 9 image * Push with rhel9 enhancements * Fix escape sequence * push changes * fixed gpg content * More fixes * update code * Check for os major * Change to int * Check os release * Check for rhel9 * Verify its rhel8 before installing package * Switch from and to && * Changes to github actions * Bump ruby version * with puppet 7 and 8 * remove nightly version * Dwongrade apache * Bump deps in metadata * Fix label * Set gem version * Run new test * test again * with inline * cat githuboutput * Restore to old matrix * Fix matrix file * switch to using contain * Revert "switch to using contain" This reverts commit 6dfd8f6. * Exception for ubuntu 2204 * try with apply * Switch to apply manifest * more chnanges * Run apply twice for 2204 * Check if hiera_config works with litmus * set values * fix syntax * Switch to firewall module for ubuntu * Update reference, drop other traffic * manage firewall * dsiable port 80 * remove default rules for testing * fix * enable icmp * fix ordering * disable fw ubuntu * Update readme and changelog * last commit * Run unit test only on PR * bump lint and unit test to use matrix * Remove check for repo owner * added password req content * Only run on PR * bump version * Readme updates --------- Co-authored-by: tyler bailey <[email protected]>
1 parent 8c22c28 commit b8c1547

36 files changed

+1431
-316
lines changed

‎.fixtures.yml

+28-22
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,47 @@
44
fixtures:
55
forge_modules:
66
stdlib:
7-
repo: "puppetlabs/stdlib"
8-
ref: "8.6.0"
7+
repo: "puppetlabs/stdlib" # needs stdlib 9 >
8+
ref: "9.6.0"
99
puppetlabs-yumrepo_core:
1010
repo: "puppetlabs/yumrepo_core"
11-
ref: "2.0.0"
11+
ref: "2.1.0"
1212
puppet-archive:
1313
repo: "puppet/archive"
14-
ref: "5.0.0"
14+
ref: "7.1.0"
1515
puppetlabs-mysql:
16-
repo: "puppetlabs/mysql"
17-
ref: "13.3.0"
16+
repo: "puppetlabs/mysql" # needs 15 or >
17+
ref: "15.0.0"
1818
puppetlabs-cron_core:
1919
repo: "puppetlabs/cron_core"
20-
ref: "1.0.5"
20+
ref: "1.3.0"
2121
puppet-selinux:
22-
repo: "puppet/selinux"
23-
ref: "3.4.0"
22+
repo: "puppet/selinux" # needs stdlib 9 >
23+
ref: "4.1.0" # needs 4>
2424
puppetlabs-apache:
2525
repo: "puppetlabs/apache"
26-
ref: "10.0.0"
26+
ref: "12.1.0"
2727
puppet-snmp:
28-
repo: "puppet/snmp"
29-
ref: "5.1.1"
28+
repo: "puppet/snmp" # needs systemd 2.5.1 >
29+
ref: "7.1.0"
3030
puppet-firewalld:
3131
repo: "puppet/firewalld"
32-
ref: "4.4.0"
33-
domkrm-ufw:
34-
repo: "domkrm/ufw"
35-
ref: "1.1.4"
36-
camptocamp-systemd:
37-
repo: "camptocamp/systemd"
38-
ref: "3.0.0"
39-
puppetlabs-concat:
32+
ref: "5.0.0"
33+
puppetlabs-firewall:
34+
repo: "puppetlabs/firewall"
35+
ref: "8.0.2"
36+
puppet-systemd: # inifile is dep
37+
repo: "puppet/systemd"
38+
ref: "7.0.0"
39+
puppetlabs-concat: # needs stdlib 9 >
4040
repo: "puppetlabs/concat"
41-
ref: "7.0.1"
41+
ref: "9.0.2"
4242
puppetlabs-augeas_core:
4343
repo: "puppetlabs/augeas_core"
44-
ref: "1.1.2"
44+
ref: "1.5.0"
45+
repositories:
46+
provision: https://github.com/puppetlabs/provision.git
47+
puppet_agent:
48+
repo: https://github.com/puppetlabs/puppetlabs-puppet_agent.git
49+
ref: v4.19.0
50+
facts: https://github.com/puppetlabs/puppetlabs-facts.git

‎.github/workflows/acceptance_test.yml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
---
2+
name: "Acceptance Testing"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- "main"
8+
9+
jobs:
10+
11+
setup_matrix:
12+
name: "Setup Test Matrix"
13+
runs-on: ubuntu-22.04
14+
outputs:
15+
matrix: ${{ steps.get-matrix.outputs.matrix }}
16+
17+
steps:
18+
- name: Checkout Source
19+
uses: actions/checkout@v3
20+
21+
- name: Activate Ruby 3.2
22+
uses: ruby/setup-ruby@v1
23+
with:
24+
ruby-version: "3.2.3"
25+
bundler-cache: true
26+
27+
- name: Print bundle environment
28+
run: |
29+
echo ::group::bundler environment
30+
bundle env
31+
echo ::endgroup::
32+
33+
- name: Setup Integration Test Matrix
34+
id: get-matrix
35+
run: |
36+
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
37+
cat $GITHUB_OUTPUT
38+
39+
acceptance:
40+
name: "Acceptance tests (${{matrix.collection.agent_version}})"
41+
needs:
42+
- setup_matrix
43+
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
44+
45+
runs-on: ubuntu-22.04
46+
strategy:
47+
fail-fast: false
48+
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
49+
50+
env:
51+
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
52+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?
53+
54+
steps:
55+
- name: Checkout Source
56+
uses: actions/checkout@v3
57+
58+
- name: Activate Ruby 3.2
59+
uses: ruby/setup-ruby@v1
60+
with:
61+
ruby-version: "3.2.3"
62+
bundler-cache: true
63+
64+
- name: Print bundle environment
65+
run: |
66+
echo ::group::bundler environment
67+
bundle env
68+
echo ::endgroup::
69+
70+
- name: Create the fixtures directory
71+
run: |
72+
bundle exec rake spec_prep
73+
74+
- name: check vars
75+
run: |
76+
export
77+
78+
- name: Provision test environment
79+
run: |
80+
bundle exec rake 'litmus:provision_list[docker]'
81+
FILE='spec/fixtures/litmus_inventory.yaml'
82+
83+
- name: Install Agents and module
84+
run: |
85+
# bundle exec rake 'litmus:install_agent'
86+
bundle exec rake 'litmus:install_agent[${{ matrix.collection.agent_version }}]'
87+
bundle exec rake litmus:install_module
88+
89+
- name: Run integration tests
90+
run: |
91+
bundle exec rake litmus:acceptance:parallel
92+
93+
- name: Remove test environment
94+
if: ${{ always() }}
95+
continue-on-error: true
96+
run: |
97+
ls -lh ./spec/fixtures/
98+
cat ./spec/fixtures/litmus_inventory.yaml
99+
bundle exec rake 'litmus:tear_down'

‎.github/workflows/lint.yaml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
name: "Lint testing"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- "main"
8+
9+
jobs:
10+
setup_matrix:
11+
name: "Setup Test Matrix"
12+
runs-on: ubuntu-22.04
13+
outputs:
14+
matrix: ${{ steps.get-matrix.outputs.matrix }}
15+
16+
steps:
17+
- name: Checkout Source
18+
uses: actions/checkout@v3
19+
20+
- name: Activate Ruby 3.2
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: "3.2.3"
24+
bundler-cache: true
25+
26+
- name: Print bundle environment
27+
run: |
28+
echo ::group::bundler environment
29+
bundle env
30+
echo ::endgroup::
31+
32+
- name: Setup Integration Test Matrix
33+
id: get-matrix
34+
run: |
35+
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
36+
cat $GITHUB_OUTPUT
37+
38+
lint:
39+
name: "Lint tests (${{matrix.collection.agent_version}})"
40+
needs:
41+
- setup_matrix
42+
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
43+
44+
runs-on: ubuntu-22.04
45+
strategy:
46+
fail-fast: false
47+
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
48+
49+
env:
50+
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
51+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?
52+
53+
steps:
54+
- name: Checkout Source
55+
uses: actions/checkout@v3
56+
57+
- name: Activate Ruby 3.2
58+
uses: ruby/setup-ruby@v1
59+
with:
60+
ruby-version: "3.2.3"
61+
bundler-cache: true
62+
63+
- name: Print bundle environment
64+
run: |
65+
echo ::group::bundler environment
66+
bundle env
67+
echo ::endgroup::
68+
69+
- name: "Run tests"
70+
run: |
71+
bundle exec rake validate

‎.github/workflows/unit_tests.yml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
name: "Unit Testing"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- "main"
8+
9+
jobs:
10+
setup_matrix:
11+
name: "Setup Test Matrix"
12+
runs-on: ubuntu-22.04
13+
outputs:
14+
matrix: ${{ steps.get-matrix.outputs.matrix }}
15+
16+
steps:
17+
- name: Checkout Source
18+
uses: actions/checkout@v3
19+
20+
- name: Activate Ruby 3.2
21+
uses: ruby/setup-ruby@v1
22+
with:
23+
ruby-version: "3.2.3"
24+
bundler-cache: true
25+
26+
- name: Print bundle environment
27+
run: |
28+
echo ::group::bundler environment
29+
bundle env
30+
echo ::endgroup::
31+
32+
- name: Setup Integration Test Matrix
33+
id: get-matrix
34+
run: |
35+
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
36+
cat $GITHUB_OUTPUT
37+
38+
Unit:
39+
name: "Unit tests (${{matrix.collection.agent_version}})"
40+
needs:
41+
- setup_matrix
42+
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
43+
44+
runs-on: ubuntu-22.04
45+
strategy:
46+
fail-fast: false
47+
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
48+
49+
env:
50+
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
51+
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?
52+
53+
steps:
54+
- name: Checkout Source
55+
uses: actions/checkout@v3
56+
57+
- name: Activate Ruby 3.2
58+
uses: ruby/setup-ruby@v1
59+
with:
60+
ruby-version: "3.2.3"
61+
bundler-cache: true
62+
63+
- name: Print bundle environment
64+
run: |
65+
echo ::group::bundler environment
66+
bundle env
67+
echo ::endgroup::
68+
69+
- name: "Run tests"
70+
run: |
71+
bundle exec rake parallel_spec

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

‎.pdkignore

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,20 +26,17 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
32+
/.github/
3433
/.gitignore
35-
/.gitlab-ci.yml
3634
/.pdkignore
3735
/.puppet-lint.rc
3836
/Rakefile
3937
/rakelib/
4038
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
39+
/..yml
4340
/.yardopts
4441
/spec/
4542
/.vscode/

0 commit comments

Comments
 (0)