Skip to content

Commit 31672e0

Browse files
Automated PR: Standardising Files
[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
1 parent aba029b commit 31672e0

File tree

5 files changed

+107
-26
lines changed

5 files changed

+107
-26
lines changed

.overcommit.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,21 @@ PreCommit:
44
enabled: true
55
YamlLint:
66
enabled: true
7-
Rspec:
7+
required_executable: "yamllint"
8+
ChefSpec:
89
enabled: true
9-
required_executable: 'rspec'
10+
required_executable: "chef"
11+
command: ["chef", "exec", "rspec"]
1012
Cookstyle:
1113
enabled: true
12-
required_executable: 'cookstyle'
14+
required_executable: "cookstyle"
1315
command: ["cookstyle"]
16+
MarkdownLint:
17+
enabled: false
18+
required_executable: "npx"
19+
command: ["npx", "markdownlint-cli2", "'**/*.md'"]
20+
include: ["**/*.md"]
21+
1422
CommitMsg:
1523
HardTabs:
1624
enabled: true

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ This file is used to list changes made in the last 3 major versions of the postg
44

55
## Unreleased
66

7+
Standardise files with files in sous-chefs/repo-management
8+
79
## 11.2.6 - *2023-04-01*
810

911
## 11.2.5 - *2023-04-01*

kitchen.dokken.yml

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
---
21
driver:
32
name: dokken
43
privileged: true
54
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
65

7-
transport:
8-
name: dokken
9-
10-
provisioner:
11-
name: dokken
6+
transport: { name: dokken }
7+
provisioner: { name: dokken }
128

139
platforms:
1410
- name: almalinux-8
@@ -21,15 +17,10 @@ platforms:
2117
image: dokken/almalinux-9
2218
pid_one_command: /usr/lib/systemd/systemd
2319

24-
- name: debian-10
25-
driver:
26-
image: dokken/debian-10
27-
pid_one_command: /bin/systemd
28-
29-
- name: debian-11
20+
- name: amazonlinux-2023
3021
driver:
31-
image: dokken/debian-11
32-
pid_one_command: /bin/systemd
22+
image: dokken/amazonlinux-2023
23+
pid_one_command: /usr/lib/systemd/systemd
3324

3425
- name: centos-7
3526
driver:
@@ -46,34 +37,49 @@ platforms:
4637
image: dokken/centos-stream-9
4738
pid_one_command: /usr/lib/systemd/systemd
4839

49-
- name: ubuntu-20.04
40+
- name: debian-9
5041
driver:
51-
image: dokken/ubuntu-20.04
42+
image: dokken/debian-9
5243
pid_one_command: /bin/systemd
5344

54-
- name: ubuntu-22.04
45+
- name: debian-10
5546
driver:
56-
image: dokken/ubuntu-22.04
47+
image: dokken/debian-10
48+
pid_one_command: /bin/systemd
49+
50+
- name: debian-11
51+
driver:
52+
image: dokken/debian-11
53+
pid_one_command: /bin/systemd
54+
55+
- name: debian-12
56+
driver:
57+
image: dokken/debian-12
5758
pid_one_command: /bin/systemd
5859

5960
- name: fedora-latest
6061
driver:
6162
image: dokken/fedora-latest
6263
pid_one_command: /usr/lib/systemd/systemd
6364

64-
- name: oracle-7
65+
- name: opensuse-leap-15
6566
driver:
66-
image: dokken/oraclelinux-7
67+
image: dokken/opensuse-leap-15
6768
pid_one_command: /usr/lib/systemd/systemd
6869

69-
- name: oracle-8
70+
- name: oraclelinux-7
7071
driver:
7172
image: dokken/oraclelinux-7
7273
pid_one_command: /usr/lib/systemd/systemd
7374

74-
- name: amazonlinux-2
75+
- name: oraclelinux-8
76+
driver:
77+
image: dokken/oraclelinux-8
78+
pid_one_command: /usr/lib/systemd/systemd
79+
80+
- name: oraclelinux-9
7581
driver:
76-
image: dokken/amazonlinux-2
82+
image: dokken/oraclelinux-9
7783
pid_one_command: /usr/lib/systemd/systemd
7884

7985
- name: rockylinux-8
@@ -85,3 +91,23 @@ platforms:
8591
driver:
8692
image: dokken/rockylinux-9
8793
pid_one_command: /usr/lib/systemd/systemd
94+
95+
- name: ubuntu-18.04
96+
driver:
97+
image: dokken/ubuntu-18.04
98+
pid_one_command: /bin/systemd
99+
100+
- name: ubuntu-20.04
101+
driver:
102+
image: dokken/ubuntu-20.04
103+
pid_one_command: /bin/systemd
104+
105+
- name: ubuntu-22.04
106+
driver:
107+
image: dokken/ubuntu-22.04
108+
pid_one_command: /bin/systemd
109+
110+
- name: ubuntu-23.04
111+
driver:
112+
image: dokken/ubuntu-23.04
113+
pid_one_command: /bin/systemd

kitchen.exec.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
driver: { name: exec }
3+
transport: { name: exec }
4+
5+
platforms:
6+
- name: macos-latest
7+
- name: windows-latest

kitchen.global.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
provisioner:
3+
name: chef_infra
4+
product_name: chef
5+
product_version: <%= ENV['CHEF_VERSION'] || 'latest' %>
6+
channel: stable
7+
install_strategy: once
8+
chef_license: accept
9+
enforce_idempotency: <%= ENV['ENFORCE_IDEMPOTENCY'] || true %>
10+
multiple_converge: <%= ENV['MULTIPLE_CONVERGE'] || 2 %>
11+
deprecations_as_errors: true
12+
log_level: <%= ENV['CHEF_LOG_LEVEL'] || 'auto' %>
13+
14+
verifier:
15+
name: inspec
16+
17+
platforms:
18+
- name: almalinux-8
19+
- name: almalinux-9
20+
- name: amazonlinux-2023
21+
- name: centos-7
22+
- name: centos-stream-8
23+
- name: centos-stream-9
24+
- name: debian-9
25+
- name: debian-10
26+
- name: debian-11
27+
- name: debian-12
28+
- name: fedora-latest
29+
- name: opensuse-leap-15
30+
- name: oraclelinux-7
31+
- name: oraclelinux-8
32+
- name: oraclelinux-9
33+
- name: rockylinux-8
34+
- name: rockylinux-9
35+
- name: ubuntu-18.04
36+
- name: ubuntu-20.04
37+
- name: ubuntu-22.04
38+
- name: ubuntu-23.04

0 commit comments

Comments
 (0)