Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 3.0.0 #16

Merged
merged 126 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
cd748a0
add todos
baile320 May 17, 2024
57c2cea
we accept this as a variable so we should respect it
baile320 May 17, 2024
2f7d1b7
remove commented out code
baile320 May 17, 2024
7833274
no passwords in the data files
baile320 May 20, 2024
88e4ec8
Push to github
benjamin-robertson May 22, 2024
32bdc57
specifically specify our database
baile320 May 22, 2024
54212f8
escape the password just in case
baile320 May 22, 2024
07aa004
empty commit
baile320 May 22, 2024
8d231bf
try this syntax
baile320 May 22, 2024
bff1ea8
empty commit
baile320 May 22, 2024
26b94ec
remote can't add users
baile320 May 22, 2024
a46b363
remove todo
baile320 May 22, 2024
c6cdb4d
Push integration tests
benjamin-robertson May 23, 2024
1c38323
export
benjamin-robertson May 23, 2024
a63908d
export vars
benjamin-robertson May 23, 2024
8e3b75a
check inventory
benjamin-robertson May 23, 2024
a5f52c6
try running task directly
benjamin-robertson May 23, 2024
efe89bf
test with location
benjamin-robertson May 23, 2024
de3c9fb
commit changes
benjamin-robertson May 24, 2024
36994e7
push changes
benjamin-robertson May 24, 2024
4f12625
Control snmp listen in observium
benjamin-robertson May 24, 2024
03a1669
disable ipv6
benjamin-robertson May 24, 2024
a8a0639
Commit run in github action
benjamin-robertson May 30, 2024
d827d25
try with provision litmus
benjamin-robertson May 30, 2024
bd18c48
Run integration tests
benjamin-robertson May 30, 2024
2ba6b70
Install the module too!!!
benjamin-robertson May 30, 2024
37bf757
Switch to provision.yaml
benjamin-robertson May 30, 2024
dd66fa3
Move provision yaml
benjamin-robertson May 30, 2024
d2d19a0
Remove centos7 add ubuntu
benjamin-robertson May 30, 2024
0edf789
add puppet facts
benjamin-robertson May 30, 2024
0bf0468
remove do
benjamin-robertson May 30, 2024
bbfa0ed
with os family
benjamin-robertson May 31, 2024
904fff1
lowercase strings
benjamin-robertson May 31, 2024
7b50fbf
Fix serverspec
benjamin-robertson May 31, 2024
5ef7a8c
added more checks
benjamin-robertson May 31, 2024
e4119e6
describe not descrube
benjamin-robertson May 31, 2024
444278e
Try with other "
benjamin-robertson May 31, 2024
4e489ca
Test again
benjamin-robertson May 31, 2024
592fa34
remove sed
benjamin-robertson May 31, 2024
cc11a6a
Test with snmp v6 listen enabled
benjamin-robertson May 31, 2024
fe40ae5
set override
benjamin-robertson May 31, 2024
1caaf4a
Setup vagrant images
benjamin-robertson May 31, 2024
4c0a8a8
added unit tests
benjamin-robertson May 31, 2024
4e52059
test unit tests
benjamin-robertson Jun 13, 2024
cc26281
Commit latest unit tests
benjamin-robertson Jun 13, 2024
24bb3c6
fix some lint issues
benjamin-robertson Jun 13, 2024
ce9bf1b
added lint tests
benjamin-robertson Jun 13, 2024
1934137
remove old plan
benjamin-robertson Jun 13, 2024
925f507
Update reference.md
benjamin-robertson Jun 13, 2024
093a110
Add lint test
benjamin-robertson Jun 13, 2024
14febc7
update name
benjamin-robertson Jun 13, 2024
b25d787
Fix lint, disable ubuntu 20.04 litmus
benjamin-robertson Jun 14, 2024
520e798
added cron serverspec entry
benjamin-robertson Jun 14, 2024
61cee70
Added more tests
benjamin-robertson Jun 14, 2024
90d94ef
check os release
benjamin-robertson Jun 14, 2024
206cfc6
Fix variable and cron
benjamin-robertson Jun 14, 2024
42f75b8
Updated serverspec
benjamin-robertson Jun 14, 2024
9f273b1
Test curl
benjamin-robertson Jun 14, 2024
f9d8038
test with should
benjamin-robertson Jun 14, 2024
96b7c3f
with full path
benjamin-robertson Jun 14, 2024
5642801
Test with stdout
benjamin-robertson Jun 14, 2024
f349e8a
test with simple command
benjamin-robertson Jun 14, 2024
243d45e
attempt with new syntax
benjamin-robertson Jun 14, 2024
abaabbf
with match
benjamin-robertson Jun 14, 2024
428101f
test
benjamin-robertson Jun 14, 2024
c88272c
revert
benjamin-robertson Jun 14, 2024
12e2a13
with quotes
benjamin-robertson Jun 14, 2024
b549620
Restore code
benjamin-robertson Jun 14, 2024
207a092
Disable breaking test
benjamin-robertson Jun 17, 2024
137d4aa
added centos7 image
benjamin-robertson Jun 17, 2024
59c9f7a
Added stream 9 image
benjamin-robertson Jun 17, 2024
fd9881b
Push with rhel9 enhancements
benjamin-robertson Jun 17, 2024
c653c28
Fix escape sequence
benjamin-robertson Jun 17, 2024
b849f55
push changes
benjamin-robertson Jun 17, 2024
db853f8
fixed gpg content
benjamin-robertson Jun 17, 2024
3830e42
More fixes
benjamin-robertson Jun 17, 2024
071185f
update code
benjamin-robertson Jun 17, 2024
23db502
Check for os major
benjamin-robertson Jun 18, 2024
c9014cd
Change to int
benjamin-robertson Jun 18, 2024
0c98a4c
Check os release
benjamin-robertson Jun 19, 2024
db1e57a
Check for rhel9
benjamin-robertson Jun 19, 2024
124d26f
Verify its rhel8 before installing package
benjamin-robertson Jun 19, 2024
e2b108d
Switch from and to &&
benjamin-robertson Jun 19, 2024
c131e56
Changes to github actions
benjamin-robertson Jun 19, 2024
b3d2960
Bump ruby version
benjamin-robertson Jun 19, 2024
9b2ee9a
with puppet 7 and 8
benjamin-robertson Jun 19, 2024
afa5917
remove nightly version
benjamin-robertson Jun 19, 2024
6e645b7
Dwongrade apache
benjamin-robertson Jun 19, 2024
830ffe9
Bump deps in metadata
benjamin-robertson Jun 19, 2024
b5597e0
Fix label
benjamin-robertson Jun 19, 2024
c721769
Set gem version
benjamin-robertson Jun 20, 2024
446a96d
Run new test
benjamin-robertson Jun 20, 2024
ed615ef
test again
benjamin-robertson Jun 20, 2024
ac87e1a
with inline
benjamin-robertson Jun 20, 2024
2b22937
cat githuboutput
benjamin-robertson Jun 20, 2024
04cda13
Restore to old matrix
benjamin-robertson Jun 20, 2024
2816496
Fix matrix file
benjamin-robertson Jun 20, 2024
6dfd8f6
switch to using contain
benjamin-robertson Jun 20, 2024
9f141ec
Revert "switch to using contain"
benjamin-robertson Jun 20, 2024
074fbaf
Exception for ubuntu 2204
benjamin-robertson Jun 20, 2024
c0ab09f
try with apply
benjamin-robertson Jun 20, 2024
ea3f0cb
Switch to apply manifest
benjamin-robertson Jun 20, 2024
66587ac
more chnanges
benjamin-robertson Jun 20, 2024
5b37fce
Run apply twice for 2204
benjamin-robertson Jun 20, 2024
197571f
Merge pull request #13 from baile320/baile320_observium_corrections
benjamin-robertson Jun 20, 2024
96a8031
Check if hiera_config works with litmus
benjamin-robertson Jun 20, 2024
ecefede
set values
benjamin-robertson Jun 20, 2024
f5c3692
fix syntax
benjamin-robertson Jun 20, 2024
b6c8a6b
Switch to firewall module for ubuntu
benjamin-robertson Jun 21, 2024
4084784
Update reference, drop other traffic
benjamin-robertson Jun 21, 2024
9186561
manage firewall
benjamin-robertson Jun 21, 2024
efed763
dsiable port 80
benjamin-robertson Jun 21, 2024
a8640d3
remove default rules for testing
benjamin-robertson Jun 21, 2024
b6a9e63
fix
benjamin-robertson Jun 21, 2024
cb90a1e
enable icmp
benjamin-robertson Jun 21, 2024
f134ee0
fix ordering
benjamin-robertson Jun 21, 2024
8094eee
disable fw ubuntu
benjamin-robertson Jun 21, 2024
be627d4
Update readme and changelog
benjamin-robertson Jun 21, 2024
623dea3
last commit
benjamin-robertson Jun 21, 2024
a04d6c7
Run unit test only on PR
benjamin-robertson Jun 24, 2024
fa3407a
bump lint and unit test to use matrix
benjamin-robertson Jun 24, 2024
7fdbf9b
Remove check for repo owner
benjamin-robertson Jun 24, 2024
52da50b
added password req content
benjamin-robertson Jun 24, 2024
51af6ff
Only run on PR
benjamin-robertson Jun 24, 2024
65aac8b
bump version
benjamin-robertson Jun 24, 2024
9ed4341
Readme updates
benjamin-robertson Jun 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions .fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,47 @@
fixtures:
forge_modules:
stdlib:
repo: "puppetlabs/stdlib"
ref: "8.6.0"
repo: "puppetlabs/stdlib" # needs stdlib 9 >
ref: "9.6.0"
puppetlabs-yumrepo_core:
repo: "puppetlabs/yumrepo_core"
ref: "2.0.0"
ref: "2.1.0"
puppet-archive:
repo: "puppet/archive"
ref: "5.0.0"
ref: "7.1.0"
puppetlabs-mysql:
repo: "puppetlabs/mysql"
ref: "13.3.0"
repo: "puppetlabs/mysql" # needs 15 or >
ref: "15.0.0"
puppetlabs-cron_core:
repo: "puppetlabs/cron_core"
ref: "1.0.5"
ref: "1.3.0"
puppet-selinux:
repo: "puppet/selinux"
ref: "3.4.0"
repo: "puppet/selinux" # needs stdlib 9 >
ref: "4.1.0" # needs 4>
puppetlabs-apache:
repo: "puppetlabs/apache"
ref: "10.0.0"
ref: "12.1.0"
puppet-snmp:
repo: "puppet/snmp"
ref: "5.1.1"
repo: "puppet/snmp" # needs systemd 2.5.1 >
ref: "7.1.0"
puppet-firewalld:
repo: "puppet/firewalld"
ref: "4.4.0"
domkrm-ufw:
repo: "domkrm/ufw"
ref: "1.1.4"
camptocamp-systemd:
repo: "camptocamp/systemd"
ref: "3.0.0"
puppetlabs-concat:
ref: "5.0.0"
puppetlabs-firewall:
repo: "puppetlabs/firewall"
ref: "8.0.2"
puppet-systemd: # inifile is dep
repo: "puppet/systemd"
ref: "7.0.0"
puppetlabs-concat: # needs stdlib 9 >
repo: "puppetlabs/concat"
ref: "7.0.1"
ref: "9.0.2"
puppetlabs-augeas_core:
repo: "puppetlabs/augeas_core"
ref: "1.1.2"
ref: "1.5.0"
repositories:
provision: https://github.com/puppetlabs/provision.git
puppet_agent:
repo: https://github.com/puppetlabs/puppetlabs-puppet_agent.git
ref: v4.19.0
facts: https://github.com/puppetlabs/puppetlabs-facts.git
99 changes: 99 additions & 0 deletions .github/workflows/acceptance_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
---
name: "Acceptance Testing"

on:
pull_request:
branches:
- "main"

jobs:

setup_matrix:
name: "Setup Test Matrix"
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: Setup Integration Test Matrix
id: get-matrix
run: |
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT

acceptance:
name: "Acceptance tests (${{matrix.collection.agent_version}})"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}

runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}

env:
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: Create the fixtures directory
run: |
bundle exec rake spec_prep

- name: check vars
run: |
export

- name: Provision test environment
run: |
bundle exec rake 'litmus:provision_list[docker]'
FILE='spec/fixtures/litmus_inventory.yaml'

- name: Install Agents and module
run: |
# bundle exec rake 'litmus:install_agent'
bundle exec rake 'litmus:install_agent[${{ matrix.collection.agent_version }}]'
bundle exec rake litmus:install_module

- name: Run integration tests
run: |
bundle exec rake litmus:acceptance:parallel

- name: Remove test environment
if: ${{ always() }}
continue-on-error: true
run: |
ls -lh ./spec/fixtures/
cat ./spec/fixtures/litmus_inventory.yaml
bundle exec rake 'litmus:tear_down'
71 changes: 71 additions & 0 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
---
name: "Lint testing"

on:
pull_request:
branches:
- "main"

jobs:
setup_matrix:
name: "Setup Test Matrix"
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: Setup Integration Test Matrix
id: get-matrix
run: |
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT

lint:
name: "Lint tests (${{matrix.collection.agent_version}})"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}

runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}

env:
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: "Run tests"
run: |
bundle exec rake validate
71 changes: 71 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
---
name: "Unit Testing"

on:
pull_request:
branches:
- "main"

jobs:
setup_matrix:
name: "Setup Test Matrix"
runs-on: ubuntu-22.04
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: Setup Integration Test Matrix
id: get-matrix
run: |
echo "matrix=$(cat test_matrix.json | tr -s '\n' ' ')" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT

Unit:
name: "Unit tests (${{matrix.collection.agent_version}})"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}

runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}

env:
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?

steps:
- name: Checkout Source
uses: actions/checkout@v3

- name: Activate Ruby 3.2
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2.3"
bundler-cache: true

- name: Print bundle environment
run: |
echo ::group::bundler environment
bundle env
echo ::endgroup::

- name: "Run tests"
run: |
bundle exec rake parallel_spec
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand Down
9 changes: 3 additions & 6 deletions .pdkignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/spec/fixtures/modules/*
/tmp/
/vendor/
/convert_report.txt
Expand All @@ -26,20 +26,17 @@
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
/appveyor.yml
/.editorconfig
/.fixtures.yml
/Gemfile
/.gitattributes
/.github/
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/..yml
/.yardopts
/spec/
/.vscode/
Expand Down
Loading
Loading