From cc1f21748aa477130e29c1fbe298f36d29528c07 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 11 Dec 2024 08:50:32 +0100
Subject: [PATCH] Sync tests from Fedora

---
 gating.yaml            |  3 +--
 plans/javapackages.fmf |  6 -----
 plans/matrix.fmf       | 50 ++++++++++++++++++++++++++++++++----------
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/gating.yaml b/gating.yaml
index 4377967..02678a0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -12,6 +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}
-  # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
-  - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/matrix/unbound/jlink.functional}
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}
diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf
index 2a75ce7..8ba3510 100644
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@@ -3,11 +3,5 @@ discover:
   how: fmf
   url: https://src.fedoraproject.org/tests/javapackages
   ref: c9s
-prepare:
-  - how: install
-    exclude:
-      - maven-openjdk8
-      - maven-openjdk11
-      - maven-openjdk21
 execute:
   how: tmt
diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index 9210a45..f1ebd5c 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -18,22 +18,23 @@ environment:
         - maven-openjdk11
         - maven-openjdk17
         - maven-openjdk21
+        - maven-unbound
 
   /full:
     summary: Maven matrix tests (OpenJDK 8 full)
     discover+:
-      filter: tag:jdk8
+      filter: tag:jdk8 & tier:0,1
 
   /headless:
     summary: Maven matrix tests (OpenJDK 8 headless)
     discover+:
-      filter: tag:jre8
+      filter: tag:jre8 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk11:
   environment+:
@@ -44,22 +45,23 @@ environment:
         - maven-openjdk8
         - maven-openjdk17
         - maven-openjdk21
+        - maven-unbound
 
   /full:
     summary: Maven matrix tests (OpenJDK 11 full)
     discover+:
-      filter: tag:jdk11
+      filter: tag:jdk11 & tier:0,1
 
   /headless:
     summary: Maven matrix tests (OpenJDK 11 headless)
     discover+:
-      filter: tag:jre11
+      filter: tag:jre11 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk17:
   environment+:
@@ -70,22 +72,23 @@ environment:
         - maven-openjdk8
         - maven-openjdk11
         - maven-openjdk21
+        - maven-unbound
 
   /full:
     summary: Maven matrix tests (OpenJDK 17 full)
     discover+:
-      filter: tag:jdk17
+      filter: tag:jdk17 & tier:0,1
 
   /headless:
     summary: Maven matrix tests (OpenJDK 17 headless)
     discover+:
-      filter: tag:jre17
+      filter: tag:jre17 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
 
 /jdk21:
   environment+:
@@ -96,19 +99,42 @@ environment:
         - maven-openjdk8
         - maven-openjdk11
         - maven-openjdk17
+        - maven-unbound
 
   /full:
     summary: Maven matrix tests (OpenJDK 21 full)
     discover+:
-      filter: tag:jdk21
+      filter: tag:jdk21 & tier:0,1
 
   /headless:
     summary: Maven matrix tests (OpenJDK 21 headless)
     discover+:
-      filter: tag:jre21
+      filter: tag:jre21 & tier:0,1
     environment+:
       OPENJDK_HEADLESS: "true"
     prepare+:
       - how: shell
         script: |
-          dnf -y erase java-*-openjdk
+          dnf -y remove java-*-openjdk
+
+/unbound:
+  prepare:
+    - how: install
+      exclude:
+        - maven-openjdk8
+        - maven-openjdk11
+        - maven-openjdk17
+        - maven-openjdk21
+
+  /jlink:
+    summary: Maven matrix tests - unbound jlink-based Java
+    discover+:
+      filter: tag:unbound & tier:0,1
+    prepare+:
+      - how: shell
+        script: |
+          test -d /opt/java && test -x /usr/local/bin/java && exit 0
+          dnf -y install java-21-openjdk-jmods
+          jlink --add-modules java.base,java.logging,java.xml,java.naming --output /opt/java
+          ln -s /opt/java/bin/java /usr/local/bin/java
+          dnf -y remove java-21-openjdk-jmods