Skip to content

Commit c2ed9da

Browse files
kanha-guptakanha-gupta
committed
Updated systemd journal remote upstream module
1 parent f779b5f commit c2ed9da

File tree

8 files changed

+171
-4
lines changed

8 files changed

+171
-4
lines changed

‎Puppetfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ mod 'obmondo/sssd',
272272

273273
mod 'obmondo/systemd_journal_remote',
274274
:git => 'https://github.com/obmondo/puppet-systemd_journal_remote.git',
275-
:ref => 'v1.2.0'
275+
:ref => 'v1.2.1'
276276

277277
mod 'voxpupuli/trusted_ca',
278278
:git => 'https://github.com/voxpupuli/puppet-trusted_ca.git',

‎modules/upstream/systemd_journal_remote/.fixtures.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
fixtures:
3+
repositories:
4+
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
5+
inifile: https://github.com/puppetlabs/puppetlabs-inifile
6+
provision: 'https://github.com/puppetlabs/provision.git'
7+
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
8+
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib
9+
systemd: https://github.com/voxpupuli/puppet-systemd
10+
symlinks:
11+
systemd_journal_remote: "#{source_dir}"

‎modules/upstream/systemd_journal_remote/.gitattributes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*.rb eol=lf
2+
*.erb eol=lf
3+
*.pp eol=lf
4+
*.sh eol=lf
5+
*.epp eol=lf

‎modules/upstream/systemd_journal_remote/.github/workflows/ci.yaml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
---
2+
name: CI
3+
4+
on:
5+
pull_request:
6+
branches: [ master, main ]
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.head_ref || github.ref_name }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
setup_matrix:
15+
name: Setup Test Matrix
16+
runs-on: ubuntu-20.04
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+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- name: Setup ruby
25+
uses: ruby/setup-ruby@v1
26+
with:
27+
ruby-version: '3.2'
28+
bundler-cache: true
29+
30+
- name: Run static validations
31+
run: bundle exec rake validate lint check
32+
33+
- name: Run rake rubocop
34+
run: bundle exec rake rubocop
35+
36+
- name: Setup Test Matrix
37+
id: get-outputs
38+
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
39+
40+
unit:
41+
needs: setup_matrix
42+
runs-on: ubuntu-20.04
43+
timeout-minutes: 40
44+
strategy:
45+
fail-fast: false
46+
matrix:
47+
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
48+
name: Spec Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
49+
steps:
50+
- uses: actions/checkout@v4
51+
52+
- name: Setup ruby
53+
uses: ruby/setup-ruby@v1
54+
with:
55+
ruby-version: ${{ matrix.ruby }}
56+
bundler-cache: true
57+
58+
- name: Run tests
59+
run: bundle exec rake parallel_spec
60+
61+
acceptance:
62+
name: Litmus Acceptance
63+
runs-on: ubuntu-20.04
64+
env:
65+
BOLT_GEM: true
66+
CI: true
67+
steps:
68+
- uses: actions/checkout@v4
69+
- name: Setup ruby
70+
uses: ruby/setup-ruby@v1
71+
with:
72+
ruby-version: '3.2'
73+
bundler-cache: true
74+
75+
- name: Provision Testing Environments
76+
run: |
77+
bundle exec rake 'litmus:provision_list[default]'
78+
bundle exec rake 'litmus:install_agent'
79+
bundle exec rake 'litmus:install_module'
80+
81+
- name: Run Tests
82+
run: bundle exec rake 'litmus:acceptance:parallel'
83+
84+
- name: Tear Down
85+
run: bundle exec rake 'litmus:tear_down'
86+
87+
tests:
88+
needs:
89+
- unit
90+
- acceptance
91+
runs-on: ubuntu-20.04
92+
name: Test suite
93+
steps:
94+
- run: echo Test suite completed

‎modules/upstream/systemd_journal_remote/.github/workflows/release.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
8+
jobs:
9+
deploy:
10+
name: Deploy to forge
11+
runs-on: ubuntu-20.04
12+
if: github.repository_owner == 'gibbs'
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup Ruby
17+
uses: ruby/setup-ruby@v1
18+
with:
19+
ruby-version: '3.2'
20+
bundler-cache: true
21+
22+
- name: Build and Deploy
23+
env:
24+
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
25+
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
26+
run: bundle exec rake module:push

‎modules/upstream/systemd_journal_remote/.gitignore‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.git/
2+
.*.sw[op]
3+
.metadata
4+
.yardoc
5+
.yardwarns
6+
*.iml
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
29+
/[Bb]ackup*/
30+
/.devcontainer/
31+
/.gitlab-ci.yml
32+
/.travis.yml
33+
/.vscode/
34+
/appveyor.yml

‎modules/upstream/systemd_journal_remote/REFERENCE.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ Struct[{
333333
Optional['trust'] => Variant[Stdlib::Unixpath, Enum['all']],
334334
Optional['gnutls-log'] => String,
335335
Optional['output'] => Stdlib::Unixpath,
336-
Optional['gnutls-log'] => String,
337336
Optional['split-mode'] => Enum['none','host'],
338337
Optional['compress'] => Enum['yes','no'],
339338
Optional['seal'] => Enum['yes','no'],
@@ -397,4 +396,3 @@ Struct[{
397396
Optional['NetworkTimeoutSec'] => Variant[Integer, String],
398397
}]
399398
```
400-

‎modules/upstream/systemd_journal_remote/types/remote_flags.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
Optional['trust'] => Variant[Stdlib::Unixpath, Enum['all']],
1212
Optional['gnutls-log'] => String,
1313
Optional['output'] => Stdlib::Unixpath,
14-
Optional['gnutls-log'] => String,
1514
Optional['split-mode'] => Enum['none','host'],
1615
Optional['compress'] => Enum['yes','no'],
1716
Optional['seal'] => Enum['yes','no'],

0 commit comments

Comments
 (0)