From 8108928ca6f37a76ca63d89d940c593bd2cdaea7 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 2 Jul 2024 13:49:05 +0200
Subject: [PATCH] Don't run javapackages-validator tests as matrix test

maven-openjdk${N} packages don't contain any Java content anyway, so
it doesn't make sense to validate them.  It is enough to validate the
core packages only.
---
 gating.yaml            |  6 ++----
 plans/javapackages.fmf | 26 +-------------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/gating.yaml b/gating.yaml
index 944af9c..a10bfea 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -12,7 +12,5 @@ rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/headless.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk8.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk11.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk17.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages/jdk21.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
+k
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 240691a..eaca4e8 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -1,3 +1,4 @@
+summary: Run javapackages-specific tests
 discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
@@ -11,28 +12,3 @@ prepare:
     - maven-openjdk21
 execute:
   how: tmt
-
-/jdk8:
-  summary: Run javapackages-specific tests (OpenJDK 8)
-  prepare+:
-    exclude-:
-      - maven-openjdk8
-
-/jdk11:
-  summary: Run javapackages-specific tests (OpenJDK 11)
-  prepare+:
-    exclude-:
-      - maven-openjdk11
-
-/jdk17:
-  summary: Run javapackages-specific tests (OpenJDK 17)
-  prepare+:
-    exclude-:
-      - maven-openjdk17
-
-/jdk21:
-  summary: Run javapackages-specific tests (OpenJDK 21)
-  prepare+:
-    exclude-:
-      - maven-openjdk21
-