drop stream8/ubi8 and most of the workarounds

ansible · Jan 17, 2024 · 763c42f · 763c42f
1 parent 2970ad5
commit 763c42f
Showing 1 changed file with 3 additions and 65 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -1312,19 +1312,9 @@ jobs:
         - tag: fedora:38
         - tag: fedora:39
         - tag: fedora:40
-        - tag: centos/centos:stream8
-          registry: quay.io
         # No matching package to install: 'python3dist(wheel)'
         # - tag: centos/centos:stream9
         #   registry: quay.io
-        - tag: ubi8/ubi:8.5
-          registry: registry.access.redhat.com
-        - tag: ubi8/ubi:8.6
-          registry: registry.access.redhat.com
-        - tag: ubi8/ubi:8.7
-          registry: registry.access.redhat.com
-        - tag: ubi8/ubi:8.8
-          registry: registry.access.redhat.com
         - tag: ubi9/ubi:9.0.0
           registry: registry.access.redhat.com
         - tag: ubi9/ubi:9.1
@@ -1351,13 +1341,6 @@ jobs:
           matrix.target-container.tag
         }}
 
-    continue-on-error: >-
-      ${{
-        contains(matrix.target-container.tag, 'ubi9')
-        && true
-        || false
-      }}
-
     steps:
     - name: Produce artifact name
       id: distribution-meta
@@ -1435,23 +1418,6 @@ jobs:
           steps.distribution-meta.outputs.dist-tag
         }}.noarch.rpm
 
-    - name: Install static test dependencies missing from UBI8
-      if: contains(matrix.target-container.tag, 'ubi8')
-      run: >-
-        rpm
-        -ivh
-        --nodeps
-        https://vault.centos.org/"$(
-          rpm --eval '%{rhel}'
-        )".4.2105/BaseOS/x86_64/os/Packages/openssh-8.0p1-6${{
-          steps.distribution-meta.outputs.dist-tag
-        }}_4.2.x86_64.rpm
-        https://rpmfind.net/linux/epel/"$(
-          rpm --eval '%{rhel}'
-        )"/Everything/x86_64/Packages/p/python3-toml-0.10.0-3${{
-          steps.distribution-meta.outputs.dist-tag
-        }}.noarch.rpm
-
     - name: Install static test dependencies missing from all UBIs
       if: contains(matrix.target-container.tag, 'ubi')
       run: >-
@@ -1483,15 +1449,7 @@ jobs:
         }}${{ steps.distribution-meta.outputs.dist-tag }}.noarch.rpm
         https://rpmfind.net/linux/epel/"$(
           rpm --eval '%{rhel}'
-        )"/Everything/x86_64/Packages/${{
-          contains(matrix.target-container.tag, 'ubi9')
-          && 't'
-          || 'p'
-        }}/${{
-          !contains(matrix.target-container.tag, 'ubi9')
-          && 'python3-'
-          || ''
-        }}tox-${{
+        )"/Everything/x86_64/Packages/t/tox-${{
           contains(matrix.target-container.tag, 'ubi9')
           && '3.28.0-1'
           || '3.4.0-2'
@@ -1503,29 +1461,9 @@ jobs:
           && '1.9.0-3'
           || '1.7.1-1'
         }}${{ steps.distribution-meta.outputs.dist-tag }}.noarch.rpm
-        https://rpmfind.net/linux/${{
-          contains(matrix.target-container.tag, 'ubi9')
-          && 'epel'
-          || 'centos'
-        }}/"$(
+        https://rpmfind.net/linux/epel/"$(
           rpm --eval '%{rhel}'
-        )"${{
-          !contains(matrix.target-container.tag, 'ubi9')
-          && '-stream'
-          || ''
-        }}/${{
-          contains(matrix.target-container.tag, 'ubi9')
-          && 'Everything'
-          || 'AppStream'
-        }}/x86_64/${{
-          !contains(matrix.target-container.tag, 'ubi9')
-          && 'os/'
-          || ''
-        }}Packages/${{
-          contains(matrix.target-container.tag, 'ubi9')
-          && 'p/'
-          || ''
-        }}python3-coverage-${{
+        )"/Everything/x86_64/Packages/p/python3-coverage-${{
           contains(matrix.target-container.tag, 'ubi9')
           && '6.2-1'
           || '4.5.1-9'