From 08b0370ffc4337d52faa37ba201f0f9a021d327d Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 06 2024 23:54:35 +0000
Subject: Consolidate java-21-openjdk packages


---

diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 29a37d3..22c65b4 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -154,15 +154,6 @@ additional_packages = [
             "ignition-edge", #ENGCMP-2770
             "ignition-validate", #ENGCMP-2656
             "intel-lpmd", #ENGCMP-3806
-            "java-21-openjdk", #ENGCMP-3350
-            "java-21-openjdk-demo", #ENGCMP-3350
-            "java-21-openjdk-devel", #ENGCMP-3350
-            "java-21-openjdk-headless", #ENGCMP-3350
-            "java-21-openjdk-javadoc-zip", #ENGCMP-3350
-            "java-21-openjdk-javadoc", #ENGCMP-3350
-            "java-21-openjdk-jmods", #ENGCMP-3350
-            "java-21-openjdk-src", #ENGCMP-3350
-            "java-21-openjdk-static-libs", #ENGCMP-3350
             "jaxb-runtime", #ENGCMP-2881
             "jaxb-xjc", #ENGCMP-2881
             "kea", #ENGCMP-3941
@@ -403,19 +394,12 @@ additional_packages = [
              "fabtests", #ENGCMP-4168
          ],
         "x86_64": [
-             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
          "aarch64": [
-             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
          "s390x": [
-             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
          ],
          "ppc64le": [
-             "java-21-openjdk-*slowdebug*", #ENGCMP-1326
-             "java-21-openjdk-*fastdebug*", #ENGCMP-1326
          ],
      }),