Skip to content

Commit

Permalink
update mailx to s-nail package install for email updates (#5)
Browse files Browse the repository at this point in the history
* update mailx to s-nail package install for email updates
  • Loading branch information
Stromweld authored Mar 17, 2023
1 parent 3d4c10c commit 8a52971
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 51 deletions.
53 changes: 8 additions & 45 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ on:

jobs:
markdownlint:
uses: Stromweld/github-workflows/.github/workflows/markdownlint.yml@main
uses: chef/github-workflows/.github/workflows/markdown-lint.yml@main

yamllint:
uses: Stromweld/github-workflows/.github/workflows/yamllint.yml@main
uses: chef/github-workflows/.github/workflows/yaml-lint.yml@main

jsonlint:
uses: Stromweld/github-workflows/.github/workflows/jsonlint.yml@main
uses: chef/github-workflows/.github/workflows/json-lint.yml@main

cookstylelint:
uses: Stromweld/github-workflows/.github/workflows/cookstylelint.yml@main
uses: chef/github-workflows/.github/workflows/cookstyle-lint.yml@main

integration-dokken:
runs-on: ubuntu-latest
strategy:
matrix:
os:
- amazonlinux-2
# - amazonlinux-2022
# - amazonlinux-2023
- centos-7
- centos-8
- almalinux-8
# - almalinux-9
- almalinux-9
- ubuntu-2004
- ubuntu-2204
suite: [ 'default' ]
Expand Down Expand Up @@ -55,42 +55,6 @@ jobs:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.dokken.yml


integration-windows-2016:
runs-on: windows-2016
strategy:
matrix:
os:
- windows-2016
suite: [ 'default' ]
fail-fast: false
steps:
- name: Check windows Version
run: systeminfo
- name: Check out code
uses: actions/checkout@main
- name: Install Chef
uses: actionshub/chef-install@main
- name: Test-Kitchen Converge
uses: actionshub/test-kitchen@main
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
action: converge
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
continue-on-error: true
- name: Test-Kitchen Verify
uses: actionshub/test-kitchen@main
with:
suite: ${{ matrix.suite }}
os: ${{ matrix.os }}
action: verify
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml

integration-windows-2019:
runs-on: windows-2019
strategy:
Expand All @@ -115,7 +79,7 @@ jobs:
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
continue-on-error: true
continue-on-error: false
- name: Test-Kitchen Verify
uses: actionshub/test-kitchen@main
with:
Expand Down Expand Up @@ -150,7 +114,7 @@ jobs:
env:
CHEF_LICENSE: accept-no-persist
KITCHEN_LOCAL_YAML: kitchen.exec.yml
continue-on-error: true
continue-on-error: false
- name: Test-Kitchen Verify
uses: actionshub/test-kitchen@main
with:
Expand All @@ -169,7 +133,6 @@ jobs:
- jsonlint
- cookstylelint
- integration-dokken
- integration-windows-2016
- integration-windows-2019
- integration-windows-2022
runs-on: Ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG for autopatch_ii

## 2.0.0 (2023/03/17)

- [Corey Hemminger] - update mailx to s-nail package install for latest rhel9 variants

## 1.4.3 (2022/06/27)

- [Corey Hemminger] - fix firstrun_patches bug introduced with previous cookstyle fix
Expand Down
3 changes: 1 addition & 2 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ provisioner:
retry_on_exit_code:
- 35 # 35 is the exit code signaling that the node is rebooting
product_name: chef
product_version: 17
always_update_cookbooks: true
deprecations_as_errors: true
chef_license: accept-no-persist
Expand All @@ -21,7 +20,7 @@ platforms:
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2
# - name: amazonlinux-2022
# - name: amazonlinux-2023
- name: centos-7
- name: centos-8
- name: debian-10
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
license 'Apache-2.0'
description 'Installs/Configures autopatch_ii'
version '1.4.3'
version '2.0.0'
chef_version '>= 14.4'

issues_url 'https://github.com/Stromweld/autopatch_ii/issues'
Expand Down
6 changes: 3 additions & 3 deletions recipes/linux.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
end

# Ensure mailx is there to send notification emails - it should be, but just in case
package value_for_platform_family(
debian: 's-nail',
default: 'mailx'
package value_for_platform(
[:amazon, :rhel, :centos, :almalinux, :rocky] => { '< 9.0' => 'mailx' },
default: 's-nail'
)

# Ensure the autopatch.log file is fresh each month and also so it doesn't infinitely grow.
Expand Down

0 comments on commit 8a52971

Please sign in to comment.