Skip to content

Commit 35805cc

Browse files
committed
Remove EOL distros from test matrices
1 parent 4502feb commit 35805cc

File tree

9 files changed

+17
-146
lines changed

9 files changed

+17
-146
lines changed

.github/workflows/ansible.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
name: Linux Test
5757
needs: lint
5858
# Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
59-
runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
59+
runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "ubuntu1604"]'), matrix.distro)] }}
6060
strategy:
6161
fail-fast: false
6262
matrix:
@@ -71,7 +71,6 @@ jobs:
7171
- centos9
7272
- debian11
7373
- debian12
74-
- opensuse12
7574
- ubuntu2004
7675
- ubuntu2204
7776

.github/workflows/auto-instrumentation.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,18 @@ jobs:
9696
testcase="\"express\",\"tomcat\",\"dotnet\""
9797
# splunk-otel-dotnet currently not supported on arm64
9898
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
99-
# opensuse-12 (leap 42) does not support arm64
100-
exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
99+
exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
101100
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"TESTCASE\": [${testcase}], \"exclude\": [${exclude}]}"
102101
echo "$matrix" | jq
103102
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
104103
outputs:
105104
matrix: ${{ steps.get-matrix.outputs.matrix }}
106105

107106
test-package:
108-
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
107+
# Amazon Linux 2 uses cgroup v1
109108
# Ubuntu 24.04 uses cgroup v2
110-
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
111-
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
109+
# Fallback to Ubuntu 20.04 when appropriate
110+
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
112111
timeout-minutes: 60
113112
needs: [cross-compile, build-package, test-package-matrix]
114113
strategy:

.github/workflows/installer-script-test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,19 @@ jobs:
3838
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
3939
arch='"amd64","arm64"'
4040
instrumentation='"none","preload","systemd"'
41-
# opensuse-12 (leap 42) does not support arm64
4241
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
43-
exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
42+
exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
4443
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}], \"exclude\": [${exclude}]}"
4544
echo "$matrix" | jq
4645
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
4746
outputs:
4847
matrix: ${{ steps.get-matrix.outputs.matrix }}
4948

5049
linux-installer-script-test:
51-
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
50+
# Amazon Linux 2 uses cgroup v1
5251
# Ubuntu 24.04 uses cgroup v2
53-
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
54-
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
52+
# Fallback to Ubuntu 20.04 when appropriate
53+
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
5554
timeout-minutes: 90
5655
needs: installer-test-matrix
5756
strategy:

.github/workflows/linux-package-test.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,19 @@ jobs:
151151
fi
152152
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
153153
arch="\"amd64\", \"arm64\""
154-
# opensuse-12 (leap 42) does not support arm64
155-
# amazonlinux-2 and tar-centos-7 require cgroup v1, only available on version 20.04 that doesn't have an arm runner
156-
exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"},{"DISTRO": "tar-centos-7", "ARCH": "arm64"}'
154+
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
155+
exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
157156
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"exclude\": [${exclude}]}"
158157
echo "$matrix" | jq
159158
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
160159
outputs:
161160
matrix: ${{ steps.get-matrix.outputs.matrix }}
162161

163162
test-package:
164-
# Amazon Linux 2, OpenSUSE 12, and centos7 use cgroup v1
163+
# Amazon Linux 2 uses cgroup v1
165164
# Ubuntu 24.04 uses cgroup v2
166-
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
167-
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12' && matrix.DISTRO != 'tar-centos-7') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
165+
# Fallback to Ubuntu 20.04 when appropriate
166+
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
168167
timeout-minutes: 30
169168
needs: [build-package, test-package-matrix]
170169
strategy:

.github/workflows/puppet-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ jobs:
8080

8181
puppet-test:
8282
name: puppet-test
83-
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
83+
# Amazon Linux 2 uses cgroup v1
8484
# Ubuntu 24.04 uses cgroup v2
85-
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
86-
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}
85+
# Fallback to Ubuntu 20.04 when appropriate
86+
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}
8787
timeout-minutes: 60
8888
needs:
8989
- puppet-lint

packaging/tests/deployments/puppet/images/rpm/Dockerfile.opensuse-12

Lines changed: 0 additions & 40 deletions
This file was deleted.

packaging/tests/images/rpm/Dockerfile.opensuse-12

Lines changed: 0 additions & 22 deletions
This file was deleted.

packaging/tests/images/tar/Dockerfile.tar-centos-7

Lines changed: 0 additions & 22 deletions
This file was deleted.

packaging/tests/instrumentation/images/rpm/Dockerfile.opensuse-12

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)