From 5e39beae04cc28aadde55aead6560ea72d5f2177 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 11 Dec 2024 14:55:58 +0100
Subject: [PATCH] Add tests from ant-unbound

---
 gating.yaml            |  1 +
 plans/javapackages.fmf |  6 ------
 plans/matrix.fmf       | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/gating.yaml b/gating.yaml
index 5ee8bad..02678a0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -12,4 +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/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 001085a..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:
-      - ant-openjdk8
-      - ant-openjdk11
-      - ant-openjdk21
 execute:
   how: tmt
diff --git a/plans/matrix.fmf b/plans/matrix.fmf
index c22a670..3666ab3 100644
--- a/plans/matrix.fmf
+++ b/plans/matrix.fmf
@@ -14,6 +14,7 @@ execute:
         - ant-openjdk11
         - ant-openjdk17
         - ant-openjdk21
+        - ant-unbound
 
   /full:
     summary: Ant matrix tests - OpenJDK 8 full
@@ -40,6 +41,7 @@ execute:
         - ant-openjdk8
         - ant-openjdk17
         - ant-openjdk21
+        - ant-unbound
 
   /full:
     summary: Ant matrix tests - OpenJDK 11 full
@@ -66,6 +68,7 @@ execute:
         - ant-openjdk8
         - ant-openjdk11
         - ant-openjdk21
+        - ant-unbound
 
   /full:
     summary: Ant matrix tests - OpenJDK 17 full
@@ -92,6 +95,7 @@ execute:
         - ant-openjdk8
         - ant-openjdk11
         - ant-openjdk17
+        - ant-unbound
 
   /full:
     summary: Ant matrix tests - OpenJDK 21 full
@@ -108,3 +112,31 @@ execute:
       - how: shell
         script: |
           dnf -y remove java-*-openjdk
+
+/unbound:
+  prepare:
+    - how: install
+      exclude:
+        - ant-openjdk8
+        - ant-openjdk11
+        - ant-openjdk17
+        - ant-openjdk21
+        # These subpackages pull in packaged Java through their dependencies
+        - ant-antlr
+        - ant-apache-regexp
+        - ant-apache-resolver
+        - ant-apache-xalan2
+        - ant-junit5
+
+  /jlink:
+    summary: Ant 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.xml --output /opt/java
+          ln -s /opt/java/bin/java /usr/local/bin/java
+          dnf -y remove java-21-openjdk-jmods