Skip to content

Commit

Permalink
Update workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
damacus committed Apr 4, 2023
1 parent b3acfe9 commit 260f6ee
Show file tree
Hide file tree
Showing 12 changed files with 147 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: ci

jobs:
lint-unit:
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.1
uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.2
permissions:
actions: write
checks: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
close-issue-message: >
Expand Down
5 changes: 5 additions & 0 deletions .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
ul-indent: false # MD007
line-length: false # MD013
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
14 changes: 11 additions & 3 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,21 @@ PreCommit:
enabled: true
YamlLint:
enabled: true
Rspec:
required_executable: "yamllint"
ChefSpec:
enabled: true
required_executable: 'rspec'
required_executable: "chef"
command: ["chef", "exec", "rspec"]
Cookstyle:
enabled: true
required_executable: 'cookstyle'
required_executable: "cookstyle"
command: ["cookstyle"]
MarkdownLint:
enabled: false
required_executable: "npx"
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
include: ["**/*.md"]

CommitMsg:
HardTabs:
enabled: true
7 changes: 4 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"recommendations": [
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig"
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig",
"DavidAnson.vscode-markdownlint"
]
}
2 changes: 2 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ rules:
max-spaces-inside: 1
min-spaces-inside-empty: -1
max-spaces-inside-empty: -1
comments:
min-spaces-from-content: 1
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

All notable changes to this project will be documented in this file.

## Unreleased

Standardise files with files in sous-chefs/repo-management

## 11.0.9 - *2023-03-13*

Standardise files with files in sous-chefs/repo-management

## 11.0.8 - *2023-02-14*

Standardise files with files in sous-chefs/repo-management
Expand Down
90 changes: 67 additions & 23 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,47 @@
---
driver:
name: dokken
privileged: true # because Docker and SystemD/Upstart
privileged: true
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
env: [CHEF_LICENSE=accept]

transport:
name: dokken

provisioner:
name: dokken
deprecations_as_errors: true
transport: { name: dokken }
provisioner: { name: dokken }

platforms:
- name: almalinux-8
driver:
image: dokken/almalinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: amazonlinux-2
- name: almalinux-9
driver:
image: dokken/almalinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: amazonlinux-2023
driver:
image: dokken/amazonlinux-2
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

- name: centos-7
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-8
driver:
image: dokken/centos-stream-8
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-9
driver:
image: dokken/centos-stream-9
pid_one_command: /usr/lib/systemd/systemd

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd

- name: debian-10
driver:
image: dokken/debian-10
Expand All @@ -33,19 +52,44 @@ platforms:
image: dokken/debian-11
pid_one_command: /bin/systemd

- name: centos-7
- name: debian-12
driver:
image: dokken/centos-7
image: dokken/debian-12
pid_one_command: /bin/systemd

- name: fedora-latest
driver:
image: dokken/fedora-latest
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-8
- name: opensuse-leap-15
driver:
image: dokken/centos-stream-8
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd

- name: fedora-latest
- name: oraclelinux-7
driver:
image: dokken/fedora-latest
image: dokken/oraclelinux-7
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-8
driver:
image: dokken/oraclelinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-9
driver:
image: dokken/oraclelinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: rockylinux-8
driver:
image: dokken/rockylinux-8
pid_one_command: /usr/lib/systemd/systemd

- name: rockylinux-9
driver:
image: dokken/rockylinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: ubuntu-18.04
Expand All @@ -58,12 +102,12 @@ platforms:
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd

- name: opensuse-leap-15
- name: ubuntu-22.04
driver:
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: rockylinux-8
- name: ubuntu-23.04
driver:
image: dokken/rockylinux-8
pid_one_command: /usr/lib/systemd/systemd
image: dokken/ubuntu-23.04
pid_one_command: /bin/systemd
7 changes: 7 additions & 0 deletions kitchen.exec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
driver: { name: exec }
transport: { name: exec }

platforms:
- name: macos-latest
- name: windows-latest
38 changes: 38 additions & 0 deletions kitchen.global.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
provisioner:
name: chef_infra
product_name: chef
product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
channel: stable
install_strategy: once
chef_license: accept
enforce_idempotency: <%= ENV['ENFORCE_IDEMPOTENCY'] || true %>
multiple_converge: <%= ENV['MULTIPLE_CONVERGE'] || 2 %>
deprecations_as_errors: true
log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>

verifier:
name: inspec

platforms:
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2023
- name: centos-7
- name: centos-stream-8
- name: centos-stream-9
- name: debian-9
- name: debian-10
- name: debian-11
- name: debian-12
- name: fedora-latest
- name: opensuse-leap-15
- name: oraclelinux-7
- name: oraclelinux-8
- name: oraclelinux-9
- name: rockylinux-8
- name: rockylinux-9
- name: ubuntu-18.04
- name: ubuntu-20.04
- name: ubuntu-22.04
- name: ubuntu-23.04
8 changes: 4 additions & 4 deletions metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@

depends 'apparmor'

%w(redhat centos scientific oracle).each do |el|
supports el, '>= 7.0'
end

suppots redhat, '>= 7.0'
supports centos, '>= 7.0'
supports scientific, '>= 7.0'
supports oracle, '>= 7.0'
supports 'amazon'
supports 'fedora'
supports 'debian', '>= 9.0'
Expand Down
2 changes: 1 addition & 1 deletion test/cookbooks/test/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This is a README
# This is a README

0 comments on commit 260f6ee

Please sign in to comment.