From 874d408d19353a424a04397bd298ecedfb14ef61 Mon Sep 17 00:00:00 2001
From: kitchen-porter <board@sous-chefs.org>
Date: Sun, 19 May 2024 07:17:17 +0000
Subject: [PATCH] Standardise files with files in sous-chefs/repo-management
Signed-off-by: kitchen-porter <board@sous-chefs.org>
---
.envrc | 1 +
CHANGELOG.md | 2 ++
CONTRIBUTING.md | 2 +-
TESTING.md | 2 +-
kitchen.dokken.yml | 29 ++---------------------------
kitchen.global.yml | 6 +-----
6 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/.envrc b/.envrc
index 6ed589ea..484ad266 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
use chefworkstation
+export KITCHEN_GLOBAL_YAML=kitchen.global.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e5a8a77..4ea593bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ This file is used to list changes made in each version of the yum cookbook.
## Unreleased
+Standardise files with files in sous-chefs/repo-management
+
## 7.4.17 - *2024-05-02*
## 7.4.16 - *2024-05-02*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a946aea1..c76e180f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
# Contributing
Please refer to
-[https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD)
+[https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/CONTRIBUTING.MD](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/CONTRIBUTING.MD)
diff --git a/TESTING.md b/TESTING.md
index 920e381f..5a7d0019 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -1,3 +1,3 @@
# Testing
-Please refer to [the community cookbook documentation on testing](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD).
+Please refer to [the community cookbook documentation on testing](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/main/TESTING.MD).
diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
index 47eff95d..1dfe62c8 100644
--- a/kitchen.dokken.yml
+++ b/kitchen.dokken.yml
@@ -22,11 +22,6 @@ platforms:
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
@@ -37,16 +32,6 @@ platforms:
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
- pid_one_command: /bin/systemd
-
- name: debian-11
driver:
image: dokken/debian-11
@@ -67,11 +52,6 @@ platforms:
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
@@ -92,11 +72,6 @@ platforms:
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
-
- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
@@ -107,7 +82,7 @@ platforms:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd
- - name: ubuntu-23.04
+ - name: ubuntu-24.04
driver:
- image: dokken/ubuntu-23.04
+ image: dokken/ubuntu-24.04
pid_one_command: /bin/systemd
diff --git a/kitchen.global.yml b/kitchen.global.yml
index a382fcd0..3967ff51 100644
--- a/kitchen.global.yml
+++ b/kitchen.global.yml
@@ -18,16 +18,12 @@ 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
@@ -35,4 +31,4 @@ platforms:
- name: ubuntu-18.04
- name: ubuntu-20.04
- name: ubuntu-22.04
- - name: ubuntu-23.04
+ - name: ubuntu-24.04