[chore][CI] Remove or justify remaining qemu usages (#6081)

* Remove or justify remaining qemu usages

* oracledb not supported on ARM

* update chmod of docker-entrypoint.sh

* Remove chmod from image since not present on latest

* Rely on COPY instead of mkdir since later not present on image

* Oracle image used in tests is not available on ARM

* mcr.microsoft.com/mssql-tools doesn't have arm64 image

* webcenter/activemq doesn't have arm64 image

* make fmt

* webcenter/activemq doesn't have arm64 image

* Undo test skipping

* Restore qemy for integration-test-docker on arm64

* Undo one left test skipping

* Correct the platform for integration tests

* Revert "Correct the platform for integration tests"

This reverts commit 87f96d3.

* Correct the platform for integration tests

* Keep integration-test-docker as originally

* Identify images that don't support arm64

Author: pjanotti

.github/workflows/auto-instrumentation.yml

@@ -168,7 +168,7 @@ jobs:
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             packaging/tests/instrumentation/instrumentation_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |

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

@@ -98,7 +98,7 @@ jobs:
           python3 -u -m pytest -s --verbose -k "$tests" \
             packaging/tests/installer_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |

.github/workflows/integration-test.yml

@@ -102,6 +102,7 @@ jobs:
           pattern: otelcol-*
           merge-multiple: true
           path: ./bin
+      # Building multiarch container images requires qemu
       - uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64,ppc64le
@@ -208,6 +209,10 @@ jobs:
         with:
           name: docker-otelcol-${{ matrix.ARCH }}
           path: ./docker-otelcol/${{ matrix.ARCH }}
+      # Not all images used in the docker-compose have arm64 support, for those it is necessary to use qemu
+      # Here is the list of "services" (see above) that don't support arm64:
+      # On profile integration: oracle
+      # On profile smartagent: activemq, and httpd
       - uses: docker/setup-qemu-action@v3
         if: ${{ matrix.ARCH != 'amd64' }}
         with:
@@ -342,7 +347,7 @@ jobs:
                 for mongodb_version in "4.0" "4.4" "5.0"; do
                   includes="${includes},{\"SERVICE\": \"${service}\", \"ARCH\": \"${arch}\", \"MONGODB_VERSION\": \"${mongodb_version}\"}"
                 done
-              elif [[ "$service" != "jmx/cassandra" || "arm64" != "$arch" ]]; then
+              elif [[ ("$service" != "jmx/cassandra" && "$service" != "oracledb") || "arm64" != "$arch" ]]; then
                 includes="${includes},{\"SERVICE\": \"${service}\", \"ARCH\": \"${arch}\"}"
               fi
             done
@@ -353,7 +358,7 @@ jobs:
 
   integration-test-discovery:
       name: integration-test-discovery
-      runs-on: ubuntu-24.04
+      runs-on: ubuntu-24.04${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
       needs: [ "docker-otelcol", "otelcol", "integration-test-discovery-matrix" ]
       strategy:
         matrix: ${{ fromJSON(needs.integration-test-discovery-matrix.outputs.matrix) }}
@@ -377,11 +382,6 @@ jobs:
           with:
             name: docker-otelcol-${{ matrix.ARCH }}
             path: ./docker-otelcol/${{ matrix.ARCH }}
-        - uses: docker/setup-qemu-action@v3
-          if: ${{ matrix.ARCH != 'amd64' }}
-          with:
-            platforms: ${{ matrix.ARCH }}
-            image: tonistiigi/binfmt:qemu-v7.0.0
         - run: docker load -i ./docker-otelcol/${{ matrix.ARCH }}/image.tar
         - run: ln -sf otelcol_linux_${{ matrix.ARCH }} ./bin/otelcol
         - run: chmod a+x ./bin/*

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

@@ -219,7 +219,7 @@ jobs:
             -k "$distro and ${{ matrix.ARCH }}" \
             packaging/tests/package_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |
@@ -260,6 +260,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: '**/go.sum'
 
+      # Building multiarch container images requires qemu
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -327,6 +328,7 @@ jobs:
               }
             }
 
+      # There are no GH runners for ppc64le, so use qemu
       - name: Set up QEMU
         if: ${{ matrix.ARCH == 'ppc64le' }}
         uses: docker/setup-qemu-action@v3

.github/workflows/puppet-test.yml

@@ -124,7 +124,7 @@ jobs:
           python3 -u -m pytest -s --verbose -k "$tests" \
             packaging/tests/deployments/puppet/puppet_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         env:

.github/workflows/salt-test.yml

@@ -103,7 +103,7 @@ jobs:
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.CONFIG }}" \
             packaging/tests/deployments/salt/salt_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |

docker/activemq/Dockerfile

@@ -7,7 +7,6 @@ ENV ACTIVEMQ_STATIC_TOPICS=testtopic
 ENV ACTIVEMQ_STATIC_QUEUES=testqueue
 
 COPY docker-entrypoint.sh /
-RUN chmod a+x /docker-entrypoint.sh
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["activemq"]

docker/activemq/docker-entrypoint.sh

@@ -2,8 +2,6 @@ FROM gvenzl/oracle-xe:21-slim-faststart
 
 ENV ORACLE_PASSWORD=mysecurepassword
 
-RUN mkdir -p /container-entrypoint-initdb.d
-
 COPY initOracleDB.sql /container-entrypoint-initdb.d/startup.sql
 
 HEALTHCHECK CMD "$ORACLE_BASE/healthcheck.sh"