Skip to content

Commit 41f8a17

Browse files
committed
Update CI platforms and node build dependencies
Updated CI and Test Kitchen configurations to use newer OS versions (e.g., amazonlinux-2023, centos-stream-10, debian-12, fedora-40, oraclelinux-9, ubuntu-24.04). Added 'tar' as a dependency for Amazon in node_build.rb and updated Python version logic. Changed test node version in standalone_install_spec.rb to 24.3.0.
1 parent aa7efc0 commit 41f8a17

File tree

4 files changed

+52
-24
lines changed

4 files changed

+52
-24
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@ jobs:
1414
strategy:
1515
matrix:
1616
os:
17-
- amazonlinux-2
18-
- centos-8
19-
- debian-11
20-
- fedora-34
21-
- oraclelinux-8
22-
- ubuntu-2004
23-
- ubuntu-2204
17+
- amazonlinux-2023
18+
- centos-stream-10
19+
- debian-12
20+
- fedora-40
21+
- oraclelinux-9
22+
- ubuntu-2404
2423
workstation_version:
25-
- '21.3.346'
26-
- '21.11.679'
27-
suite: [default]
24+
- '24.12.1073'
25+
- '25.5.1084'
2826
fail-fast: false
2927
steps:
3028
- name: Check out code
31-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3230
- name: Install Chef
3331
uses: actionshub/chef-install@main
3432
with:
@@ -40,7 +38,7 @@ jobs:
4038
- name: Test-Kitchen
4139
uses: actionshub/test-kitchen@main
4240
with:
43-
suite: ${{ matrix.suite }}
41+
suite: default
4442
os: ${{ matrix.os }}
4543
env:
4644
KITCHEN_LOCAL_YAML: kitchen.dokken.yml

kitchen.dokken.yml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,50 @@ verifier:
1717
chef_license: accept-no-persist
1818

1919
platforms:
20-
- name: amazonlinux-2
20+
- name: amazonlinux-2023
2121
driver:
22-
image: dokken/amazonlinux-2
22+
image: dokken/amazonlinux-2023
2323
pid_one_command: /usr/lib/systemd/systemd
24-
- name: centos-8
24+
- name: centos-stream-9
2525
driver:
26-
image: dokken/centos-8
26+
image: dokken/centos-stream-9
27+
pid_one_command: /usr/lib/systemd/systemd
28+
- name: centos-stream-10
29+
driver:
30+
image: dokken/centos-stream-10
2731
pid_one_command: /usr/lib/systemd/systemd
2832
- name: debian-11
2933
driver:
3034
image: dokken/debian-11
3135
pid_one_command: /bin/systemd
3236
intermediate_instructions:
3337
- RUN /usr/bin/apt-get update -qq
34-
- name: fedora-34
38+
- name: debian-12
39+
driver:
40+
image: dokken/debian-12
41+
pid_one_command: /bin/systemd
42+
intermediate_instructions:
43+
- RUN /usr/bin/apt-get update -qq
44+
- name: fedora-40
45+
driver:
46+
image: dokken/fedora-40
47+
pid_one_command: /usr/lib/systemd/systemd
48+
- name: fedora-41
3549
driver:
36-
image: dokken/fedora-34
50+
image: dokken/fedora-41
51+
pid_one_command: /usr/lib/systemd/systemd
52+
- name: fedora-42
53+
driver:
54+
image: dokken/fedora-42
3755
pid_one_command: /usr/lib/systemd/systemd
3856
- name: oraclelinux-8
3957
driver:
4058
image: dokken/oraclelinux-8
4159
pid_one_command: /usr/lib/systemd/systemd
60+
- name: oraclelinux-9
61+
driver:
62+
image: dokken/oraclelinux-9
63+
pid_one_command: /usr/lib/systemd/systemd
4264
- name: ubuntu-20.04
4365
driver:
4466
image: dokken/ubuntu-20.04
@@ -51,6 +73,12 @@ platforms:
5173
pid_one_command: /bin/systemd
5274
intermediate_instructions:
5375
- RUN /usr/bin/apt-get update -qq
76+
- name: ubuntu-24.04
77+
driver:
78+
image: dokken/ubuntu-24.04
79+
pid_one_command: /bin/systemd
80+
intermediate_instructions:
81+
- RUN /usr/bin/apt-get update -qq
5482

5583
suites:
5684
- name: default

libraries/chef/node_build.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
class Chef
22
module NodeBuild
33
def node_build_dependencies
4-
[python, gcc, make].compact
4+
[tar, python, gcc, make].compact
55
end
66

77
def python
88
version = node['platform_version'].to_i
9-
if platform?('centos') && version >= 8 then 'python3'
10-
elsif platform?('oracle') && version >= 8 then 'python36'
11-
elsif platform?('ubuntu') && version >= 20 then 'python3'
12-
elsif platform?(*supported_plaftorms) then 'python'
9+
if platform?('oracle') && version == 8 then 'python36'
10+
elsif platform?(*supported_plaftorms) then 'python3'
1311
end
1412
end
1513

@@ -24,6 +22,10 @@ def make
2422
'make' if platform?(*supported_plaftorms)
2523
end
2624

25+
def tar
26+
'tar' if platform?('amazon')
27+
end
28+
2729
def supported_plaftorms
2830
%w(amazon centos debian fedora oracle ubuntu)
2931
end

test/integration/default/standalone_install_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
control 'build a node version with a node-build binary' do
3131
node_versions_home = '/tmp/node-build-versions'
32-
node_version = '12.16.1'
32+
node_version = '24.3.0'
3333

3434
node_home = ::File.join node_versions_home, node_version
3535
describe command("#{node_build_bin} #{node_version} #{node_home}") do

0 commit comments

Comments
 (0)