Automated PR: Standardising Files (#240)

* Standardise files with files in sous-chefs/repo-management Signed-off-by: kitchen-porter <board@sous-chefs.org> * Standardise files with files in sous-chefs/repo-management Signed-off-by: kitchen-porter <board@sous-chefs.org> --------- Signed-off-by: kitchen-porter <board@sous-chefs.org> Co-authored-by: Dan Webb <dan.webb@damacus.io>
sous-chefs · Nov 1, 2023 · 46158e0 · 46158e0
1 parent c5c79c0
commit 46158e0
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 41 deletions.
diff --git a/.overcommit.yml b/.overcommit.yml
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This file is used to list changes made in each version of the ntp cookbook.
 
 ## Unreleased
 
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
 ## 5.0.14 - *2023-10-31*
 
 ## 5.0.13 - *2023-09-28*

diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -1,44 +1,70 @@
----
 driver:
   name: dokken
-  privileged: true  # because Docker and SystemD
+  privileged: true
   chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
-  chef_license: accept-no-persist
 
-transport:
-  name: dokken
-
-provisioner:
-  name: dokken
+transport: { name: dokken }
+provisioner: { name: dokken }
 
 platforms:
-  - name: amazonlinux-2
+  - name: almalinux-8
+    driver:
+      image: dokken/almalinux-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: almalinux-9
     driver:
-      image: dokken/amazonlinux-2
+      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
+      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
+      image: dokken/opensuse-leap-15
       pid_one_command: /usr/lib/systemd/systemd
 
   - name: oraclelinux-7
@@ -51,26 +77,37 @@ platforms:
       image: dokken/oraclelinux-8
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: fedora-latest
+  - name: oraclelinux-9
     driver:
-      image: dokken/fedora-latest
+      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-20.04
       pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
 
-  - name: opensuse-leap-15
+  - name: ubuntu-22.04
     driver:
-      image: dokken/opensuse-leap-15
+      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
diff --git a/kitchen.exec.yml b/kitchen.exec.yml
@@ -1,14 +1,7 @@
 ---
-driver:
-  name: exec
-
-transport:
-  name: exec
-
-provisioner:
-  name: chef_zero
-  deprecations_as_errors: true
+driver: { name: exec }
+transport: { name: exec }
 
 platforms:
-  - name: windows-latest
   - name: macos-latest
+  - name: windows-latest
diff --git a/kitchen.global.yml b/kitchen.global.yml
@@ -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
diff --git a/renovate.json b/renovate.json
@@ -1,9 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["config:base"],
-  "packageRules": [{
+  "packageRules": [
+    {
       "groupName": "Actions",
-      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "matchUpdateTypes": ["minor", "patch", "pin"],
       "automerge": true,
       "addLabels": ["Release: Patch", "Skip: Announcements"]
     },