Skip to content

Commit 02fe57e

Browse files
authored
[chore][ci]linux-package-test: remove ubuntu-20.04 GH runner (#6090)
1 parent a990720 commit 02fe57e

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
./bin/*
7070
7171
agent-bundle-linux:
72-
runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
72+
runs-on: ${{ fromJSON('["ubuntu-24.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
7373
strategy:
7474
matrix:
7575
ARCH: ["amd64", "arm64"]
@@ -151,19 +151,14 @@ jobs:
151151
fi
152152
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
153153
arch="\"amd64\", \"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"}'
156-
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"exclude\": [${exclude}]}"
154+
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}]}"
157155
echo "$matrix" | jq
158156
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
159157
outputs:
160158
matrix: ${{ steps.get-matrix.outputs.matrix }}
161159

162160
test-package:
163-
# Amazon Linux 2 uses cgroup v1
164-
# Ubuntu 24.04 uses cgroup v2
165-
# Fallback to Ubuntu 20.04 when appropriate
166-
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
161+
runs-on: ubuntu-24.04${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
167162
timeout-minutes: 30
168163
needs: [build-package, test-package-matrix]
169164
strategy:

0 commit comments

Comments
 (0)