[chore][ci]salt-test: remove ubuntu-20.04 GH runner (#6093)

Author: pjanotti

.github/workflows/salt-test.yml

@@ -68,10 +68,7 @@ jobs:
 
   salt-test:
     name: salt-test
-    # 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'] }}
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     needs: [salt-lint-test, salt-test-matrix]
     strategy:
@@ -96,10 +93,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
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.CONFIG }}" \
             packaging/tests/deployments/salt/salt_test.py
 
@@ -108,10 +101,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
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.CONFIG }}" \
             --last-failed \
             packaging/tests/deployments/salt/salt_test.py

packaging/tests/deployments/salt/images/distro_docker_opts.yaml

@@ -4,7 +4,6 @@ deb:
   ubuntu-jammy: ["DISTRO_IMAGE=ubuntu:22.04"]
 
 rpm:
-  amazonlinux-2: ["DISTRO_IMAGE=amazonlinux:2", "PKG_MGR=yum"]
   amazonlinux-2023: ["DISTRO_IMAGE=amazonlinux:2023"]
   centos-8: ["DISTRO_IMAGE=quay.io/centos/centos:stream8"]
   centos-9: ["DISTRO_IMAGE=quay.io/centos/centos:stream9"]