Skip to content

Commit 45dff65

Browse files
authored
[chore][CI] Replace some qemu usage for arm with GH runner (#6052)
* Replace qemu usage for arm with GH runner * More direct replacements of qemu * Undo change for tests using oracledb image * Explain why keeping one qemu * Remove qemu from integration-test-discovery * Revert "Remove qemu from integration-test-discovery" This reverts commit e212924. * Better style for ppc64le
1 parent 352b4a6 commit 45dff65

File tree

4 files changed

+7
-33
lines changed

4 files changed

+7
-33
lines changed

.github/workflows/auto-instrumentation.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
./bin/*
5454
5555
build-package:
56-
runs-on: ubuntu-24.04
56+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
5757
strategy:
5858
matrix:
5959
SYS_PACKAGE: [ "deb", "rpm" ]
@@ -64,12 +64,6 @@ jobs:
6464
with:
6565
fetch-depth: 0
6666

67-
- uses: docker/setup-qemu-action@v3
68-
if: ${{ matrix.ARCH != 'amd64' }}
69-
with:
70-
platforms: ${{ matrix.ARCH }}
71-
image: tonistiigi/binfmt:qemu-v7.0.0
72-
7367
- name: Run tests
7468
run: make -C instrumentation tests ARCH=${{ matrix.ARCH }}
7569

.github/workflows/integration-test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138

139139
integration-vet:
140140
name: integration-vet
141-
runs-on: ubuntu-24.04
141+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
142142
strategy:
143143
matrix:
144144
ARCH: [ "amd64", "arm64" ]
@@ -160,11 +160,6 @@ jobs:
160160
with:
161161
name: docker-otelcol-${{ matrix.ARCH }}
162162
path: ./docker-otelcol/${{ matrix.ARCH }}
163-
- uses: docker/setup-qemu-action@v3
164-
if: ${{ matrix.ARCH != 'amd64' }}
165-
with:
166-
platforms: ${{ matrix.ARCH }}
167-
image: tonistiigi/binfmt:qemu-v7.0.0
168163
- run: docker load -i ./docker-otelcol/${{ matrix.ARCH }}/image.tar
169164
- run: ln -sf otelcol_linux_${{ matrix.ARCH }} ./bin/otelcol
170165
- run: chmod a+x ./bin/*

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ jobs:
308308
path: ./docker-otelcol
309309

310310
docker-otelcol-verify:
311-
runs-on: ubuntu-24.04
311+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
312312
needs: [docker-otelcol]
313313
strategy:
314314
matrix:
@@ -330,7 +330,7 @@ jobs:
330330
}
331331
332332
- name: Set up QEMU
333-
if: ${{ matrix.ARCH != 'amd64' }}
333+
if: ${{ matrix.ARCH == 'ppc64le' }}
334334
uses: docker/setup-qemu-action@v3
335335
with:
336336
platforms: ${{ matrix.ARCH }}

.github/workflows/vuln-scans.yml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
./bin/*
9999
100100
trivy-image-scan:
101-
runs-on: ubuntu-24.04
101+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
102102
needs: docker-otelcol
103103
strategy:
104104
matrix:
@@ -107,11 +107,6 @@ jobs:
107107
fail-fast: false
108108
steps:
109109
- uses: actions/checkout@v4
110-
- uses: docker/setup-qemu-action@v3
111-
if: ${{ matrix.ARCH != 'amd64' }}
112-
with:
113-
platforms: ${{ matrix.ARCH }}
114-
image: tonistiigi/binfmt:qemu-v7.0.0
115110
- uses: actions/download-artifact@v4
116111
with:
117112
name: otelcol-${{ matrix.ARCH }}${{ matrix.FIPS == true && '-fips' || '' }}
@@ -129,7 +124,7 @@ jobs:
129124
ignore-unfixed: true
130125

131126
anchore-image-scan:
132-
runs-on: ubuntu-24.04
127+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
133128
needs: docker-otelcol
134129
strategy:
135130
matrix:
@@ -140,11 +135,6 @@ jobs:
140135
GRYPE_PLATFORM: ${{ matrix.ARCH }}
141136
steps:
142137
- uses: actions/checkout@v4
143-
- uses: docker/setup-qemu-action@v3
144-
if: ${{ matrix.ARCH != 'amd64' }}
145-
with:
146-
platforms: ${{ matrix.ARCH }}
147-
image: tonistiigi/binfmt:qemu-v7.0.0
148138
- uses: actions/download-artifact@v4
149139
with:
150140
name: otelcol-${{ matrix.ARCH }}${{ matrix.FIPS == true && '-fips' || '' }}
@@ -241,7 +231,7 @@ jobs:
241231
sarif_file: snyk.sarif
242232

243233
snyk-docker-scan:
244-
runs-on: ubuntu-24.04
234+
runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
245235
needs: [docker-otelcol, check-snyk-token]
246236
if: ${{ needs.check-snyk-token.outputs.has-snyk-token == 'true' }}
247237
strategy:
@@ -251,11 +241,6 @@ jobs:
251241
fail-fast: false
252242
steps:
253243
- uses: actions/checkout@v4
254-
- uses: docker/setup-qemu-action@v3
255-
if: ${{ matrix.ARCH != 'amd64' }}
256-
with:
257-
platforms: ${{ matrix.ARCH }}
258-
image: tonistiigi/binfmt:qemu-v7.0.0
259244
- uses: actions/download-artifact@v4
260245
with:
261246
name: otelcol-${{ matrix.ARCH }}${{ matrix.FIPS == true && '-fips' || '' }}

0 commit comments

Comments
 (0)