Skip to content

Commit 9f579df

Browse files
authored
[chef] [chore] Upgrade CI workers for chef tests (#5811)
The tests for old systems (amazonlinux-2, opensuse-12, oraclelinux-7) was removed. Newer versions of Chef v18.x+ come with ruby 3.1 which requires glibc 2.28. The removed systems go with glibc 2.26. We could've test them with an old Chef version 17.x, but it has reached EOL.
1 parent 1f306bf commit 9f579df

File tree

3 files changed

+4
-36
lines changed

3 files changed

+4
-36
lines changed

.github/workflows/chef-test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ env:
3232
jobs:
3333
chef-lint-spec-test:
3434
name: chef-lint-spec-test
35-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
36-
runs-on: ubuntu-20.04
35+
runs-on: ubuntu-24.04
3736
steps:
3837
- name: Check out the codebase.
3938
uses: actions/checkout@v4
@@ -46,7 +45,7 @@ jobs:
4645
make rake-spec
4746
4847
chef-kitchen-matrix:
49-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-24.04
5049
steps:
5150
- name: Check out code
5251
uses: actions/checkout@v4
@@ -80,8 +79,7 @@ jobs:
8079
win-matrix: ${{ steps.get-win-matrix.outputs.matrix }}
8180

8281
chef-kitchen-linux:
83-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
84-
runs-on: ubuntu-20.04
82+
runs-on: ubuntu-24.04
8583
needs: [chef-lint-spec-test, chef-kitchen-matrix]
8684
strategy:
8785
matrix: ${{ fromJSON(needs.chef-kitchen-matrix.outputs.linux-matrix) }}

.github/workflows/chef.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ permissions:
1717
jobs:
1818
push-release-tag:
1919
name: Push Release Tag
20-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
21-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
2221
if: github.ref == 'refs/heads/main'
2322
steps:
2423
- name: Checkout

deployments/chef/kitchen.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ verifier:
2121
name: inspec
2222

2323
platforms:
24-
- name: amazonlinux-2
25-
driver:
26-
image: dokken/amazonlinux-2
27-
pid_one_command: /usr/lib/systemd/systemd
28-
2924
- name: centos-9
3025
driver:
3126
image: dokken/centos-stream-9
@@ -51,35 +46,11 @@ platforms:
5146
image: dokken/debian-12
5247
pid_one_command: /bin/systemd
5348

54-
- name: opensuse-12
55-
driver:
56-
image: opensuse/leap:42
57-
intermediate_instructions: |
58-
ENV container docker
59-
RUN sed -i 's|download.opensuse.org|ftp5.gwdg.de/pub/opensuse/discontinued|' /etc/zypp/repos.d/*.repo
60-
RUN zypper -n clean && zypper -n refresh
61-
RUN zypper -n install -l curl procps dbus-1 systemd-sysvinit tar wget hostname sudo
62-
RUN (cd /usr/lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \
63-
"systemd-tmpfiles-setup.service" ] || rm -f $i; done); \
64-
rm -f /usr/lib/systemd/system/multi-user.target.wants/*;\
65-
rm -f /usr/lib/systemd/system/local-fs.target.wants/*; \
66-
rm -f /usr/lib/systemd/system/sockets.target.wants/*udev*; \
67-
rm -f /usr/lib/systemd/system/sockets.target.wants/*initctl*; \
68-
rm -f /usr/lib/systemd/system/basic.target.wants/*;\
69-
rm -f /usr/lib/systemd/system/anaconda.target.wants/*;
70-
ENV init /sbin/init
71-
pid_one_command: /sbin/init
72-
7349
- name: opensuse-15
7450
driver:
7551
image: dokken/opensuse-leap-15
7652
pid_one_command: /usr/lib/systemd/systemd
7753

78-
- name: oraclelinux-7
79-
driver:
80-
image: dokken/oraclelinux-7
81-
pid_one_command: /usr/lib/systemd/systemd
82-
8354
- name: oraclelinux-8
8455
driver:
8556
image: dokken/oraclelinux-8

0 commit comments

Comments
 (0)