Skip to content

Commit

Permalink
Automated PR: Standardising Files
Browse files Browse the repository at this point in the history
[skip ci] This PR will standardise the files we have with out agreed spec in sous-chefs/repo-management.
This repo has been identified by topic(s) of chef-cookbook
  • Loading branch information
kitchen-porter authored Apr 7, 2023
1 parent 932ebcb commit 66a23a6
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 24 deletions.
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

This file is used to list changes made in each version of the apache2 cookbook.

## Unreleased

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


## 8.15.6 - *2023-04-01*

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

transport:
name: dokken

provisioner:
name: dokken
chef_license: accept-no-persist
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 @@ -31,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 @@ -56,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

0 comments on commit 66a23a6

Please sign in to comment.