[chore][CI] Reducing qemu and Ubuntu 20.04 usage (#6053)

* Remove issue 16450 from CI

* Try previous version of amazon2 image

* Revert "Try previous version of amazon2 image"

This reverts commit 37092c2.

* Use ubuntu-24.04 and fallback when needed

* Fix expression

* Fix expression

* Fallback to the correct version

* Leverage exclude and fix suffix

* Fix linux-package-test workflow

* Delete extra line in linux-package-test

* Fix slat-test

* Fix puppet-test

* Fix auto-instrumentation

Author: pjanotti

.github/workflows/auto-instrumentation.yml

@@ -94,16 +94,21 @@ jobs:
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           arch="\"amd64\", \"arm64\""
           testcase="\"express\",\"tomcat\",\"dotnet\""
-          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"}'  # splunk-otel-dotnet currently not supported on arm64
+          # splunk-otel-dotnet currently not supported on arm64
+          # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
+          # opensuse-12 (leap 42) does not support arm64
+          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
           matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"TESTCASE\": [${testcase}], \"exclude\": [${exclude}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
   test-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    # Amazon Linux 2 and OpenSUSE 12 use cgroup v1
+    # Ubuntu 24.04 uses cgroup v2
+    # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
+    runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 60
     needs: [cross-compile, build-package, test-package-matrix]
     strategy:
@@ -134,12 +139,6 @@ jobs:
           name: splunk-otel-auto-instrumentation-${{ matrix.ARCH }}-${{ env.SYS_PACKAGE }}
           path: ./instrumentation/dist
 
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.ARCH != 'amd64' }}
-        with:
-          platforms: ${{ matrix.ARCH }}
-          image: tonistiigi/binfmt:qemu-v7.0.0
-
       - name: Setup python
         uses: actions/setup-python@v5
         with:

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

@@ -38,16 +38,20 @@ jobs:
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           arch='"amd64","arm64"'
           instrumentation='"none","preload","systemd"'
-          exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"}'  # opensuse-12 (leap 42) does not support arm64
+          # opensuse-12 (leap 42) does not support arm64
+          # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
+          exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
           matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}], \"exclude\": [${exclude}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
   linux-installer-script-test:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    # Amazon Linux 2 and OpenSUSE 12 use cgroup v1
+    # Ubuntu 24.04 uses cgroup v2
+    # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
+    runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 90
     needs: installer-test-matrix
     strategy:
@@ -61,12 +65,6 @@ jobs:
       - name: Check out the codebase.
         uses: actions/checkout@v4
 
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.ARCH != 'amd64' }}
-        with:
-          platforms: ${{ matrix.ARCH }}
-          image: tonistiigi/binfmt:qemu-v7.0.0
-
       - name: Setup python
         uses: actions/setup-python@v5
         with:

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

@@ -151,15 +151,20 @@ jobs:
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           arch="\"amd64\", \"arm64\""
-          matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}]}"
+          # opensuse-12 (leap 42) does not support arm64
+          # amazonlinux-2 and tar-centos-7 require cgroup v1, only available on version 20.04 that doesn't have an arm runner
+          exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"},{"DISTRO": "tar-centos-7", "ARCH": "arm64"}'
+          matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"exclude\": [${exclude}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
   test-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    # Amazon Linux 2, OpenSUSE 12, and centos7 use cgroup v1
+    # Ubuntu 24.04 uses cgroup v2
+    # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
+    runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12' && matrix.DISTRO != 'tar-centos-7') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 30
     needs: [build-package, test-package-matrix]
     strategy:
@@ -185,12 +190,6 @@ jobs:
           name: ${{ env.SYS_PACKAGE }}-${{ matrix.ARCH }}-package
           path: ./dist
 
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.ARCH != 'amd64' }}
-        with:
-          platforms: ${{ matrix.ARCH }}
-          image: tonistiigi/binfmt:qemu-v7.0.0
-
       - name: Setup python
         uses: actions/setup-python@v5
         with:

.github/workflows/puppet-test.yml

@@ -80,8 +80,10 @@ jobs:
 
   puppet-test:
     name: puppet-test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    # Amazon Linux 2 and OpenSUSE 12 use cgroup v1
+    # Ubuntu 24.04 uses cgroup v2
+    # Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
+    runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}
     timeout-minutes: 60
     needs:
       - puppet-lint

.github/workflows/salt-test.yml

@@ -68,8 +68,10 @@ jobs:
 
   salt-test:
     name: salt-test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    # Amazon Linux 2 uses cgroup v1
+    # Ubuntu 24.04 uses cgroup v2
+    # Fallback to Ubuntu 20.04 when needed
+    runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[matrix.DISTRO == 'amazonlinux-2'] }}
     timeout-minutes: 60
     needs: [salt-lint-test, salt-test-matrix]
     strategy: