From b48b88005c84e3370b03bacfd5455d2ea8868b72 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Wed, 3 Jul 2024 11:47:38 +0200
Subject: [PATCH] .gitlab-ci.yml: remove rhel-8.4

8.4 EUS is now EOL, just test on 8.10 from now on.
---
 .gitlab-ci.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcdbce282..a27e73e55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,8 +96,6 @@ RPM:
           - aws/fedora-39-aarch64
           - aws/fedora-40-x86_64
           - aws/fedora-40-aarch64
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
@@ -177,8 +175,6 @@ Base:
       - RUNNER:
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
@@ -205,8 +201,6 @@ Base:
           - aws/fedora-39-x86_64
           - aws/fedora-39-aarch64
       - RUNNER:
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
           - aws/rhel-8.10-ga-x86_64
           - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.4-ga-x86_64
@@ -292,8 +286,8 @@ Image Tests:
   parallel:
     matrix:
       - RUNNER:
-          - aws/rhel-8.4-ga-x86_64
-          - aws/rhel-8.4-ga-aarch64
+          - aws/rhel-8.10-ga-x86_64
+          - aws/rhel-8.10-ga-aarch64
           - aws/rhel-9.5-nightly-x86_64
           - aws/rhel-9.5-nightly-aarch64
         INTERNAL_NETWORK: ["true"]
@@ -320,7 +314,6 @@ Trigger-rhel-edge-ci:
 
 .rhel_runners: &rhel_runners
     RUNNER:
-      - aws/rhel-8.4-ga-x86_64
       - aws/rhel-8.10-ga-x86_64
       - aws/rhel-9.4-ga-x86_64
       - aws/rhel-9.5-nightly-x86_64
@@ -398,7 +391,6 @@ koji.sh (cloudapi):
 aws.sh:
   extends: .integration
   rules:
-    # Skip rhel-8.4-ga-x86_64
     - if: '$CI_PIPELINE_SOURCE != "schedule" && $RUNNER !~ /[\S]+rhel-8.4-[\S]+/'
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $RUNNER =~ /[\S]+rhel-9.5-[^ga][\S]+/ && $NIGHTLY == "true" && $RHEL_MAJOR == "9"'
   variables: