Merge branch 'main' into main

.envrc

@@ -1 +1,2 @@
 use chefworkstation
+export KITCHEN_GLOBAL_YAML=kitchen.global.yml

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ name: ci
 
 jobs:
   lint-unit:
-    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@2.0.6
+    uses: sous-chefs/.github/.github/workflows/lint-unit.yml@3.1.1
     permissions:
       actions: write
       checks: write
@@ -49,9 +49,9 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Install Chef
-        uses: actionshub/chef-install@2.0.4
+        uses: actionshub/chef-install@3.0.0
       - name: Dokken
-        uses: actionshub/test-kitchen@2.1.0
+        uses: actionshub/test-kitchen@3.0.0
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           close-issue-message: >

.markdownlint-cli2.yaml

@@ -3,3 +3,5 @@ config:
   line-length: false # MD013
   no-duplicate-heading: false # MD024
   reference-links-images: false # MD052
+ignores:
+  - .github/copilot-instructions.md

CHANGELOG.md

@@ -4,6 +4,24 @@ This file is used to list changes made in each version of the jenkins cookbook.
 
 ## Unreleased
 
+## 9.5.23 - *2024-11-18*
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+## 9.5.22 - *2024-07-15*
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+Standardise files with files in sous-chefs/repo-management
+
+## 9.5.21 - *2024-05-02*
+
+## 9.5.20 - *2024-05-02*
+
 ## 9.5.19 - *2023-10-03*
 
 Update Jenkins apt/rpm repository key urls.

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)

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).

kitchen.dokken.yml

@@ -17,35 +17,25 @@ platforms:
       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
+  - name: almalinux-10
     driver:
-      image: dokken/centos-7
+      image: dokken/almalinux-10
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: centos-stream-8
+  - name: amazonlinux-2023
     driver:
-      image: dokken/centos-stream-8
+      image: dokken/amazonlinux-2023
       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
+  - name: centos-stream-10
     driver:
-      image: dokken/debian-10
-      pid_one_command: /bin/systemd
+      image: dokken/centos-stream-10
+      pid_one_command: /usr/lib/systemd/systemd
 
   - name: debian-11
     driver:
@@ -67,11 +57,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 +77,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 +87,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

kitchen.global.yml

@@ -18,21 +18,15 @@ 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
+  - name: ubuntu-24.04

metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email  '[email protected]'
 license           'Apache-2.0'
 description       'Installs and configures Jenkins CI master & slaves'
-version           '9.5.19'
+version           '9.5.23'
 source_url        'https://github.com/sous-chefs/jenkins'
 issues_url        'https://github.com/sous-chefs/jenkins/issues'
 chef_version      '>= 13.0'

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"]
     },