Skip to content

Commit 5ec4a74

Browse files
authored
[chore] Upgrade ubuntu CI runners (#5665)
Skipping chef and ansible tests for now
1 parent 41a63cf commit 5ec4a74

17 files changed

+46
-77
lines changed

.github/workflows/auto-instrumentation.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ env:
2626

2727
jobs:
2828
cross-compile:
29-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
30-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
3130
strategy:
3231
matrix:
3332
SYS_BINARIES: [ "binaries-linux_amd64", "binaries-linux_arm64" ]
@@ -53,7 +52,7 @@ jobs:
5352
./bin/*
5453
5554
build-package:
56-
runs-on: ubuntu-20.04
55+
runs-on: ubuntu-24.04
5756
strategy:
5857
matrix:
5958
SYS_PACKAGE: [ "deb", "rpm" ]
@@ -83,7 +82,7 @@ jobs:
8382
path: ./instrumentation/dist/*.${{ matrix.SYS_PACKAGE }}
8483

8584
test-package-matrix:
86-
runs-on: ubuntu-20.04
85+
runs-on: ubuntu-24.04
8786
steps:
8887
- name: Check out code
8988
uses: actions/checkout@v4

.github/workflows/bosh-release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919

2020
test:
2121
name: Test Bosh Release Creation
22-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
23-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2423
steps:
2524
- name: Check out the codebase.
2625
uses: actions/checkout@v4

.github/workflows/build-and-test.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ env:
3030
jobs:
3131
setup-environment:
3232
name: setup-environment
33-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
34-
runs-on: ubuntu-20.04
33+
runs-on: ubuntu-24.04
3534
steps:
3635
- name: Check out the codebase.
3736
uses: actions/checkout@v4
@@ -48,8 +47,7 @@ jobs:
4847
4948
tidy:
5049
name: tidy
51-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
52-
runs-on: ubuntu-20.04
50+
runs-on: ubuntu-24.04
5351
needs: [setup-environment]
5452
steps:
5553
- name: Check out the codebase.
@@ -72,8 +70,7 @@ jobs:
7270
7371
gofmt:
7472
name: gofmt
75-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
76-
runs-on: ubuntu-20.04
73+
runs-on: ubuntu-24.04
7774
needs: [setup-environment]
7875
steps:
7976
- name: Check out the codebase.
@@ -96,8 +93,7 @@ jobs:
9693
9794
generate-metrics:
9895
name: generate-metrics
99-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
100-
runs-on: ubuntu-20.04
96+
runs-on: ubuntu-24.04
10197
needs: [setup-environment]
10298
steps:
10399
- name: Check out the codebase.
@@ -122,8 +118,7 @@ jobs:
122118
123119
lint:
124120
name: lint
125-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
126-
runs-on: ubuntu-20.04
121+
runs-on: ubuntu-24.04
127122
needs: [setup-environment]
128123
steps:
129124
- name: Check out the codebase.
@@ -149,8 +144,7 @@ jobs:
149144
150145
test:
151146
name: test
152-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
153-
runs-on: ubuntu-20.04
147+
runs-on: ubuntu-24.04
154148
needs: [setup-environment]
155149
steps:
156150
- name: Check out the codebase.
@@ -186,8 +180,7 @@ jobs:
186180
187181
coverage:
188182
name: coverage
189-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
190-
runs-on: ubuntu-20.04
183+
runs-on: ubuntu-24.04
191184
needs: [setup-environment]
192185
steps:
193186
- name: Check out the codebase.
@@ -212,8 +205,7 @@ jobs:
212205

213206
cross-compile:
214207
name: cross-compile
215-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
216-
runs-on: ubuntu-20.04
208+
runs-on: ubuntu-24.04
217209
needs: [setup-environment]
218210
strategy:
219211
matrix:

.github/workflows/cloudfoundry_buildpack.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919

2020
test:
2121
name: Test buildpack supplies required dependencies
22-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
23-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2423
steps:
2524
- name: Check out the codebase.
2625
uses: actions/checkout@v4

.github/workflows/gendependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
jobs:
1414
gendependabot:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- uses: actions/checkout@v4
1818
- uses: actions/setup-go@v5

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ concurrency:
2121

2222
jobs:
2323
installer-test-matrix:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-24.04
2525
steps:
2626
- name: Check out code
2727
uses: actions/checkout@v4

.github/workflows/integration-test.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030
GO_VERSION: "1.22.7"
3131
jobs:
3232
agent-bundle-linux:
33-
runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
33+
runs-on: ${{ fromJSON('["ubuntu-24.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
3434
strategy:
3535
matrix:
3636
ARCH: [ "amd64", "arm64" ]
@@ -53,7 +53,7 @@ jobs:
5353
path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz
5454

5555
otelcol:
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-24.04
5757
strategy:
5858
matrix:
5959
ARCH: [ "amd64", "arm64", "ppc64le" ]
@@ -74,8 +74,7 @@ jobs:
7474
7575
docker-otelcol:
7676
name: docker-otelcol
77-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
78-
runs-on: ubuntu-20.04
77+
runs-on: ubuntu-24.04
7978
needs: [ "agent-bundle-linux", "otelcol" ]
8079
services:
8180
# Start a local registry for pushing the multiarch manifest and images
@@ -139,8 +138,7 @@ jobs:
139138

140139
integration-vet:
141140
name: integration-vet
142-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
143-
runs-on: ubuntu-20.04
141+
runs-on: ubuntu-24.04
144142
strategy:
145143
matrix:
146144
ARCH: [ "amd64", "arm64" ]
@@ -175,8 +173,7 @@ jobs:
175173
SPLUNK_OTEL_COLLECTOR_IMAGE: 'otelcol:latest'
176174

177175
integration-test-docker:
178-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
179-
runs-on: ubuntu-20.04
176+
runs-on: ubuntu-24.04
180177
needs: [ "docker-otelcol", "otelcol" ]
181178
strategy:
182179
matrix:
@@ -333,7 +330,7 @@ jobs:
333330
retention-days: 5
334331

335332
integration-test-discovery-matrix:
336-
runs-on: ubuntu-22.04
333+
runs-on: ubuntu-24.04
337334
outputs:
338335
matrix: ${{ steps.get-matrix.outputs.matrix }}
339336
steps:
@@ -359,7 +356,7 @@ jobs:
359356
360357
integration-test-discovery:
361358
name: integration-test-discovery
362-
runs-on: ubuntu-22.04
359+
runs-on: ubuntu-24.04
363360
needs: [ "docker-otelcol", "otelcol", "integration-test-discovery-matrix" ]
364361
strategy:
365362
matrix: ${{ fromJSON(needs.integration-test-discovery-matrix.outputs.matrix) }}

.github/workflows/lint-examples.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ env:
1919
jobs:
2020
lint:
2121
name: lint
22-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
23-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2423
steps:
2524
- name: Check out the codebase.
2625
uses: actions/checkout@v4

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ env:
2626

2727
jobs:
2828
setup-environment:
29-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
30-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
3130
steps:
3231
- name: Check out the codebase.
3332
uses: actions/checkout@v4
@@ -43,8 +42,7 @@ jobs:
4342
make install-tools
4443
4544
cross-compile:
46-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
47-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-24.04
4846
needs: [setup-environment]
4947
strategy:
5048
matrix:
@@ -97,8 +95,7 @@ jobs:
9795
path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz
9896

9997
build-package:
100-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
101-
runs-on: ubuntu-20.04
98+
runs-on: ubuntu-24.04
10299
needs: [cross-compile, agent-bundle-linux]
103100
strategy:
104101
matrix:
@@ -138,7 +135,7 @@ jobs:
138135
path: ./dist/splunk-otel-collector*
139136

140137
test-package-matrix:
141-
runs-on: ubuntu-20.04
138+
runs-on: ubuntu-24.04
142139
steps:
143140
- name: Check out code
144141
uses: actions/checkout@v4
@@ -239,8 +236,7 @@ jobs:
239236
packaging/tests/package_test.py
240237
241238
docker-otelcol:
242-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
243-
runs-on: ubuntu-20.04
239+
runs-on: ubuntu-24.04
244240
needs: [cross-compile, agent-bundle-linux]
245241
steps:
246242
# Multiarch images require more disk space
@@ -312,8 +308,7 @@ jobs:
312308
path: ./docker-otelcol
313309

314310
docker-otelcol-verify:
315-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
316-
runs-on: ubuntu-20.04
311+
runs-on: ubuntu-24.04
317312
needs: [docker-otelcol]
318313
strategy:
319314
matrix:

.github/workflows/lychee.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ on:
1616

1717
jobs:
1818
linkChecker:
19-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
20-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-24.04
2120
steps:
2221
- uses: actions/checkout@v4
2322
- name: lychee Link Checker

.github/workflows/puppet-test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ env:
3434
jobs:
3535
puppet-lint:
3636
name: puppet-lint
37-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
38-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-24.04
3938
steps:
4039
- name: Check out the codebase.
4140
uses: actions/checkout@v4
@@ -46,8 +45,7 @@ jobs:
4645
4746
puppet-rake-spec:
4847
name: puppet-rake-spec
49-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
50-
runs-on: ubuntu-20.04
48+
runs-on: ubuntu-24.04
5149
steps:
5250
- name: Check out the codebase.
5351
uses: actions/checkout@v4
@@ -57,7 +55,7 @@ jobs:
5755
make -C deployments/puppet rake-spec
5856
5957
puppet-test-matrix:
60-
runs-on: ubuntu-20.04
58+
runs-on: ubuntu-24.04
6159
steps:
6260
- name: Check out code
6361
uses: actions/checkout@v4

.github/workflows/puppet.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

.github/workflows/release-requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ concurrency:
1212

1313
jobs:
1414
install-requirements:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Check out the codebase.
1818
uses: actions/checkout@v4

.github/workflows/salt-test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ env:
3232
jobs:
3333
salt-lint-test:
3434
name: salt-lint-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
@@ -43,7 +42,7 @@ jobs:
4342
make -C deployments/salt lint
4443
4544
salt-test-matrix:
46-
runs-on: ubuntu-20.04
45+
runs-on: ubuntu-24.04
4746
steps:
4847
- name: Check out code
4948
uses: actions/checkout@v4

.github/workflows/tanzu-tile.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020

2121
test:
2222
name: Test Tanzu Tile creation
23-
# Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
24-
runs-on: ubuntu-20.04
23+
runs-on: ubuntu-24.04
2524
steps:
2625
- name: Check out the codebase.
2726
uses: actions/checkout@v4

0 commit comments

Comments
 (0)