Skip to content

Commit 68d897d

Browse files
Fix chef tests (#4993)
1 parent 2de401f commit 68d897d

File tree

2 files changed

+10
-39
lines changed

2 files changed

+10
-39
lines changed

.github/workflows/chef-test.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ defaults:
2525
run:
2626
working-directory: 'deployments/chef'
2727

28+
env:
29+
CHEF_VERSION: "22.12.1024"
30+
CHEF_LICENSE: accept
31+
2832
jobs:
2933
chef-lint-spec-test:
3034
name: chef-lint-spec-test
@@ -89,7 +93,7 @@ jobs:
8993
- name: Install chef
9094
uses: actionshub/[email protected]
9195
with:
92-
version: 21.12.720
96+
version: ${{ env.CHEF_VERSION }}
9397

9498
- run: kitchen test ${{ matrix.DISTRO }}
9599

@@ -112,12 +116,10 @@ jobs:
112116
- name: Install chef
113117
uses: actionshub/[email protected]
114118
with:
115-
version: 21.12.720
119+
version: ${{ env.CHEF_VERSION }}
116120

117121
- name: Install kitchen-docker
118-
run: |
119-
chef env --chef-license accept
120-
chef gem install kitchen-docker -v 2.12.0
122+
run: chef gem install kitchen-docker -v 2.12.0
121123

122124
- name: kitchen test ${{ matrix.SUITE }}-${{ matrix.DISTRO }}
123125
run: |

deployments/chef/kitchen.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ driver:
33
name: dokken
44
chef_license: accept
55
privileged: true
6+
cgroupns_host: true
7+
volumes:
8+
- /sys/fs/cgroup:/sys/fs/cgroup:rw
69

710
transport:
811
name: dokken
@@ -22,43 +25,31 @@ platforms:
2225
driver:
2326
image: dokken/amazonlinux-2
2427
pid_one_command: /usr/lib/systemd/systemd
25-
volumes:
26-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2728

2829
- name: centos-7
2930
driver:
3031
image: dokken/centos-7
3132
pid_one_command: /usr/lib/systemd/systemd
32-
volumes:
33-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3433

3534
- name: centos-8
3635
driver:
3736
image: dokken/centos-8
3837
pid_one_command: /usr/lib/systemd/systemd
39-
volumes:
40-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
4138

4239
- name: centos-9
4340
driver:
4441
image: dokken/centos-stream-9
4542
pid_one_command: /usr/lib/systemd/systemd
46-
volumes:
47-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
4843

4944
- name: rockylinux-8
5045
driver:
5146
image: dokken/rockylinux-8
5247
pid_one_command: /usr/lib/systemd/systemd
53-
volumes:
54-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
5548

5649
- name: rockylinux-9
5750
driver:
5851
image: dokken/rockylinux-9
5952
pid_one_command: /usr/lib/systemd/systemd
60-
volumes:
61-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
6253

6354
- name: debian-9
6455
driver:
@@ -67,29 +58,21 @@ platforms:
6758
RUN sed -i 's|http://.*.debian.org|http://archive.debian.org|' /etc/apt/sources.list
6859
RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
6960
pid_one_command: /bin/systemd
70-
volumes:
71-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
7261

7362
- name: debian-10
7463
driver:
7564
image: dokken/debian-10
7665
pid_one_command: /bin/systemd
77-
volumes:
78-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
7966

8067
- name: debian-11
8168
driver:
8269
image: dokken/debian-11
8370
pid_one_command: /bin/systemd
84-
volumes:
85-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
8671

8772
- name: debian-12
8873
driver:
8974
image: dokken/debian-12
9075
pid_one_command: /bin/systemd
91-
volumes:
92-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
9376

9477
- name: opensuse-12
9578
driver:
@@ -109,50 +92,36 @@ platforms:
10992
rm -f /usr/lib/systemd/system/anaconda.target.wants/*;
11093
ENV init /sbin/init
11194
pid_one_command: /sbin/init
112-
volumes:
113-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
11495

11596
- name: opensuse-15
11697
driver:
11798
image: dokken/opensuse-leap-15
11899
pid_one_command: /usr/lib/systemd/systemd
119-
volumes:
120-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
121100

122101
- name: oraclelinux-7
123102
driver:
124103
image: dokken/oraclelinux-7
125104
pid_one_command: /usr/lib/systemd/systemd
126-
volumes:
127-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
128105

129106
- name: oraclelinux-8
130107
driver:
131108
image: dokken/oraclelinux-8
132109
pid_one_command: /usr/lib/systemd/systemd
133-
volumes:
134-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
135110

136111
- name: ubuntu-18.04
137112
driver:
138113
image: dokken/ubuntu-18.04
139114
pid_one_command: /bin/systemd
140-
volumes:
141-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
142115

143116
- name: ubuntu-20.04
144117
driver:
145118
image: dokken/ubuntu-20.04
146119
pid_one_command: /bin/systemd
147-
volumes:
148-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
149120

150121
- name: ubuntu-22.04
151122
driver:
152123
image: dokken/ubuntu-22.04
153124
pid_one_command: /bin/systemd
154-
volumes:
155-
- /sys/fs/cgroup:/sys/fs/cgroup:ro
156125

157126
suites:
158127
- name: default

0 commit comments

Comments
 (0)