Skip to content

Commit d73e22f

Browse files
committed
fix: revert hardcoded chef_version, fix pid_one_command arrays, revert protected files
- Revert chef_version to ENV || current - Fix pid_one_command from YAML arrays to strings (fixes scan error) - Remove hardcoded CHEF_VERSION from mise.toml - Revert metadata.rb and CHANGELOG.md to main (protected files)
1 parent 02bbdf0 commit d73e22f

4 files changed

Lines changed: 22 additions & 31 deletions

File tree

kitchen.dokken.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
driver:
33
name: dokken
44
privileged: true
5-
chef_version: 18.9.4
5+
chef_version: <%= ENV['CHEF_VERSION'] || 'current' %>
66

77
transport: { name: dokken }
88
provisioner: { name: dokken }
@@ -11,84 +11,84 @@ platforms:
1111
- name: almalinux-8
1212
driver:
1313
image: dokken/almalinux-8
14-
pid_one_command: ["/usr/lib/systemd/systemd"]
14+
pid_one_command: /usr/lib/systemd/systemd
1515

1616
- name: almalinux-9
1717
driver:
1818
image: dokken/almalinux-9
19-
pid_one_command: ["/usr/lib/systemd/systemd"]
19+
pid_one_command: /usr/lib/systemd/systemd
2020

2121
- name: almalinux-10
2222
driver:
2323
image: dokken/almalinux-10
24-
pid_one_command: ["/usr/lib/systemd/systemd"]
24+
pid_one_command: /usr/lib/systemd/systemd
2525

2626
- name: amazonlinux-2023
2727
driver:
2828
image: dokken/amazonlinux-2023
29-
pid_one_command: ["/usr/lib/systemd/systemd"]
29+
pid_one_command: /usr/lib/systemd/systemd
3030

3131
- name: centos-stream-9
3232
driver:
3333
image: dokken/centos-stream-9
34-
pid_one_command: ["/usr/lib/systemd/systemd"]
34+
pid_one_command: /usr/lib/systemd/systemd
3535

3636
- name: centos-stream-10
3737
driver:
3838
image: dokken/centos-stream-10
39-
pid_one_command: ["/usr/lib/systemd/systemd"]
39+
pid_one_command: /usr/lib/systemd/systemd
4040

4141
- name: debian-11
4242
driver:
4343
image: dokken/debian-11
44-
pid_one_command: ["/bin/systemd"]
44+
pid_one_command: /bin/systemd
4545

4646
- name: debian-12
4747
driver:
4848
image: dokken/debian-12
49-
pid_one_command: ["/bin/systemd"]
49+
pid_one_command: /bin/systemd
5050

5151
- name: fedora-latest
5252
driver:
5353
image: dokken/fedora-latest
54-
pid_one_command: ["/usr/lib/systemd/systemd"]
54+
pid_one_command: /usr/lib/systemd/systemd
5555

5656
- name: opensuse-leap-15
5757
driver:
5858
image: dokken/opensuse-leap-15
59-
pid_one_command: ["/usr/lib/systemd/systemd"]
59+
pid_one_command: /usr/lib/systemd/systemd
6060

6161
- name: oraclelinux-8
6262
driver:
6363
image: dokken/oraclelinux-8
64-
pid_one_command: ["/usr/lib/systemd/systemd"]
64+
pid_one_command: /usr/lib/systemd/systemd
6565

6666
- name: oraclelinux-9
6767
driver:
6868
image: dokken/oraclelinux-9
69-
pid_one_command: ["/usr/lib/systemd/systemd"]
69+
pid_one_command: /usr/lib/systemd/systemd
7070

7171
- name: rockylinux-8
7272
driver:
7373
image: dokken/rockylinux-8
74-
pid_one_command: ["/usr/lib/systemd/systemd"]
74+
pid_one_command: /usr/lib/systemd/systemd
7575

7676
- name: rockylinux-9
7777
driver:
7878
image: dokken/rockylinux-9
79-
pid_one_command: ["/usr/lib/systemd/systemd"]
79+
pid_one_command: /usr/lib/systemd/systemd
8080

8181
- name: ubuntu-20.04
8282
driver:
8383
image: dokken/ubuntu-20.04
84-
pid_one_command: ["/bin/systemd"]
84+
pid_one_command: /bin/systemd
8585

8686
- name: ubuntu-22.04
8787
driver:
8888
image: dokken/ubuntu-22.04
89-
pid_one_command: ["/bin/systemd"]
89+
pid_one_command: /bin/systemd
9090

9191
- name: ubuntu-24.04
9292
driver:
9393
image: dokken/ubuntu-24.04
94-
pid_one_command: ["/bin/systemd"]
94+
pid_one_command: /bin/systemd

metadata.rb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# frozen_string_literal: true
2-
31
name 'haproxy'
42
maintainer 'Sous Chefs'
53
maintainer_email 'help@sous-chefs.org'
@@ -10,15 +8,9 @@
108
issues_url 'https://github.com/sous-chefs/haproxy/issues'
119
chef_version '>= 16'
1210

13-
supports 'almalinux'
14-
supports 'amazon'
15-
supports 'centos'
1611
supports 'debian'
17-
supports 'fedora'
18-
supports 'opensuseleap'
19-
supports 'oracle'
20-
supports 'redhat'
21-
supports 'rocky'
2212
supports 'ubuntu'
23-
13+
supports 'centos'
14+
supports 'amazon'
15+
supports 'opensuseleap'
2416
depends 'yum-epel'

mise.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[env]
22
_.path = "/opt/chef-workstation/bin"
33
KITCHEN_LOCAL_YAML = "kitchen.dokken.yml"
4-
CHEF_VERSION = "18.8.72"

spec/unit/resources/install_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
platform 'almalinux', '9'
5252

5353
recipe do
54-
node.automatic['platform_version'] = '10'
54+
node.automatic['platform_version'] = '10.0'
5555
haproxy_install 'source'
5656
end
5757
before(:each) do

0 commit comments

Comments
 (0)