From 9109bd9f7f5a065566d8171189ba611d48f56e99 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 2 Jul 2024 11:45:27 +0200
Subject: [PATCH] Backport tests from Fedora

---
 gating.yaml                     | 16 +++++-----
 plans/{smoke.fmf => matrix.fmf} | 52 ++++++++++++++++++++-------------
 2 files changed, 40 insertions(+), 28 deletions(-)
 rename plans/{smoke.fmf => matrix.fmf} (52%)

diff --git a/gating.yaml b/gating.yaml
index 5b41fc0..944af9c 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -4,14 +4,14 @@ product_versions:
 decision_contexts:
   - osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/full.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk8/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk11/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk17/headless.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke/jdk21/headless.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk11/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk17/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk21/full.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/jdk8/headless.functional}
+  - !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}
diff --git a/plans/smoke.fmf b/plans/matrix.fmf
similarity index 52%
rename from plans/smoke.fmf
rename to plans/matrix.fmf
index 3fe82c5..b661f7c 100644
--- a/plans/smoke.fmf
+++ b/plans/matrix.fmf
@@ -16,18 +16,20 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 8 full)
+    summary: Maven matrix tests - OpenJDK 8 full
+    discover+:
+      filter: tag:jdk8
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 8 headless)
+    summary: Maven matrix tests - OpenJDK 8 headless
     discover+:
-      filter: tag:-java-compiler
+      filter: tag:jre8
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk11:
   environment:
@@ -40,16 +42,20 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 11 full)
+    summary: Maven matrix tests - OpenJDK 11 full
+    discover+:
+      filter: tag:jdk11
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 11 headless)
+    summary: Maven matrix tests - OpenJDK 11 headless
+    discover+:
+      filter: tag:jre11
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk17:
   environment:
@@ -62,22 +68,24 @@ execute:
         - maven-openjdk21
 
   /full:
-    summary: Basic smoke tests (OpenJDK 17 full)
+    summary: Maven matrix tests - OpenJDK 17 full
+    discover+:
+      filter: tag:jdk17
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 17 headless)
+    summary: Maven matrix tests - OpenJDK 17 headless
+    discover+:
+      filter: tag:jre17
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk21:
   environment:
-    # For now OpenJDK 21 RPM packages are still called "java-latest-openjdk"
-    OPENJDK_VERSION: latest
-    #OPENJDK_VERSION: 21
+    OPENJDK_VERSION: 21
   prepare:
     - how: install
       exclude:
@@ -86,14 +94,18 @@ execute:
         - maven-openjdk17
 
   /full:
-    summary: Basic smoke tests (OpenJDK 21 full)
+    summary: Maven matrix tests - OpenJDK 21 full
+    discover+:
+      filter: tag:jdk21
 
   /headless:
-    summary: Basic smoke tests (OpenJDK 21 headless)
+    summary: Maven matrix tests - OpenJDK 21 headless
+    discover+:
+      filter: tag:jre21
     environment+:
-      OPENJDK_HEADLESS: true
+      OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk