[chore][ci]auto-instrumentation: remove ubuntu-20.04 GH runner (#6087)

* [chore][ci]auto-instrumentation: remove ubuntu-20.04 GH runner

* Remove amazonlinux-2

* Remove amazonlinux-2

Author: pjanotti

.github/workflows/auto-instrumentation.yml

@@ -86,7 +86,7 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro and arch
-          dockerfiles=$(find packaging/tests/instrumentation/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(find packaging/tests/instrumentation/images -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
             echo "Failed to get dockerfiles from packaging/tests/instrumentation/images!" >&2
             exit 1
@@ -95,19 +95,15 @@ jobs:
           arch="\"amd64\", \"arm64\""
           testcase="\"express\",\"tomcat\",\"dotnet\""
           # 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
-          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
+          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"}'
           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:
-    # Amazon Linux 2 uses cgroup v1
-    # Ubuntu 24.04 uses cgroup v2
-    # Fallback to Ubuntu 20.04 when appropriate
-    runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
+    runs-on: ubuntu-24.04${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 60
     needs: [cross-compile, build-package, test-package-matrix]
     strategy:
@@ -160,10 +156,6 @@ jobs:
         continue-on-error: true
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             packaging/tests/instrumentation/instrumentation_test.py
@@ -173,10 +165,6 @@ jobs:
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             --last-failed \

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

@@ -38,19 +38,14 @@ jobs:
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           arch='"amd64","arm64"'
           instrumentation='"none","preload","systemd"'
-          # amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
-          exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
-          matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}], \"exclude\": [${exclude}]}"
+          matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
   linux-installer-script-test:
-    # Amazon Linux 2 uses cgroup v1
-    # Ubuntu 24.04 uses cgroup v2
-    # Fallback to Ubuntu 20.04 when appropriate
-    runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
+    runs-on: ubuntu-24.04${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 90
     needs: installer-test-matrix
     strategy:
@@ -86,10 +81,6 @@ jobs:
         continue-on-error: true
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           if [[ "${{ matrix.INSTRUMENTATION }}" = "none" ]]; then
             tests="$distro and ${{ matrix.ARCH }} and not instrumentation"
           else
@@ -103,10 +94,6 @@ jobs:
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           if [[ "${{ matrix.INSTRUMENTATION }}" = "none" ]]; then
             tests="$distro and ${{ matrix.ARCH }} and not instrumentation"
           else