diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 602a7de476..f33db729dc 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -27,7 +27,7 @@ env: GO_VERSION: "1.21.11" jobs: agent-bundle-linux: - runs-on: ubuntu-20.04 + runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }} strategy: matrix: ARCH: [ "amd64", "arm64" ] @@ -41,11 +41,6 @@ jobs: key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }} restore-keys: | agent-bundle-buildx-${{ matrix.ARCH }}- - - uses: docker/setup-qemu-action@v3 - if: ${{ matrix.ARCH != 'amd64' }} - with: - platforms: ${{ matrix.ARCH }} - image: tonistiigi/binfmt:qemu-v7.0.0 - run: make -C internal/signalfx-agent/bundle agent-bundle-linux ARCH=${{ matrix.ARCH }} env: BUNDLE_CACHE_HIT: "${{ steps.bundle-cache.outputs.cache-hit }}" diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml index 0c9c91a2d5..91c2d76432 100644 --- a/.github/workflows/linux-package-test.yml +++ b/.github/workflows/linux-package-test.yml @@ -79,7 +79,7 @@ jobs: ./bin/* agent-bundle-linux: - runs-on: ubuntu-20.04 + runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }} strategy: matrix: ARCH: ["amd64", "arm64"] @@ -95,12 +95,6 @@ jobs: restore-keys: | agent-bundle-buildx-${{ matrix.ARCH }}- - - uses: docker/setup-qemu-action@v3 - if: ${{ matrix.ARCH != 'amd64' }} - with: - platforms: ${{ matrix.ARCH }} - image: tonistiigi/binfmt:qemu-v7.0.0 - - run: make -C internal/signalfx-agent/bundle agent-bundle-linux ARCH=${{ matrix.ARCH }} env: BUNDLE_CACHE_HIT: "${{ steps.bundle-cache.outputs.cache-hit }}" diff --git a/.github/workflows/vuln-scans.yml b/.github/workflows/vuln-scans.yml index 71ceb94151..f6028d951f 100644 --- a/.github/workflows/vuln-scans.yml +++ b/.github/workflows/vuln-scans.yml @@ -50,7 +50,7 @@ jobs: path: "." docker-otelcol: - runs-on: ubuntu-20.04 + runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }} strategy: matrix: ARCH: [ "amd64", "arm64" ] @@ -68,11 +68,6 @@ jobs: key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }} restore-keys: | agent-bundle-buildx-${{ matrix.ARCH }}- - - uses: docker/setup-qemu-action@v3 - if: ${{ matrix.ARCH != 'amd64' }} - with: - platforms: ${{ matrix.ARCH }} - image: tonistiigi/binfmt:qemu-v7.0.0 - run: | make docker-otelcol ARCH=${{ matrix.ARCH }} env: