Skip to content

Commit

Permalink
Update standardfiles (#65)
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Webb <[email protected]>
  • Loading branch information
damacus authored Oct 31, 2023
1 parent a10a5e5 commit 9001ebb
Show file tree
Hide file tree
Showing 10 changed files with 159 additions and 40 deletions.
3 changes: 2 additions & 1 deletion .markdownlint-cli2.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
config:
ul-indent: false # MD007
line-length: false # MD013
no-duplicate-heading/no-duplicate-header: false # MD024
no-duplicate-heading: false # MD024
reference-links-images: false # MD052
18 changes: 11 additions & 7 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +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"]
Delivery:
enabled: true
required_executable: 'delivery'
flags: ['local', 'all']
MarkdownLint:
enabled: false
required_executable: "npx"
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
include: ["**/*.md"]

CommitMsg:
HardTabs:
enabled: true
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"recommendations": [
"chef-software.chef",
"rebornix.ruby",
"editorconfig.editorconfig"
"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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

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

## 3.0.6 - *2023-03-02*

## 3.0.5 - *2023-03-01*
Expand Down
2 changes: 1 addition & 1 deletion chefignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Dangerfile
examples/*
features/*
Guardfile
kitchen.yml*
kitchen*.yml
mlc_config.json
Procfile
Rakefile
Expand Down
109 changes: 81 additions & 28 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,113 @@
---
driver:
name: dokken
privileged: true
env: [CHEF_LICENSE=accept]
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>

transport:
name: dokken

provisioner:
name: dokken
product_name: chef
product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
install_strategy: once
transport: { name: dokken }
provisioner: { name: dokken }

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

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

- name: amazonlinux-2023
driver:
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
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: debian-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: centos-7
- name: debian-11
driver:
image: dokken/centos-7
platform: rhel
image: dokken/debian-11
pid_one_command: /bin/systemd

- name: debian-12
driver:
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-8
- name: opensuse-leap-15
driver:
image: dokken/centos-8
platform: rhel
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-7
driver:
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
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: ubuntu-20.04
driver:
image: dokken/ubuntu-16.04
image: dokken/ubuntu-20.04
pid_one_command: /bin/systemd
intermediate_instructions:
- RUN /usr/bin/apt-get update

- name: amazonlinux-2
- name: ubuntu-22.04
driver:
image: dokken/amazonlinux-2
pid_one_command: /usr/lib/systemd/systemd
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: ubuntu-23.04
driver:
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
15 changes: 13 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base"
"extends": ["config:base"],
"packageRules": [{
"groupName": "Actions",
"matchUpdateTypes": ["patch", "pin", "digest"],
"automerge": true,
"addLabels": ["Release: Patch", "Skip: Announcements"]
},
{
"groupName": "Actions",
"matchUpdateTypes": ["major"],
"automerge": false,
"addLabels": ["Release: Patch", "Skip: Announcements"]
}
]
}

0 comments on commit 9001ebb

Please sign in to comment.