From be4b02e85a336fac1ea6f2dc8280ced073260000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branislav=20N=C3=A1ter?= <bnater@redhat.com>
Date: Fri, 5 Jun 2026 21:12:21 +0200
Subject: [PATCH] Use imported test plans

---
 ci.fmf                   |  1 -
 gating.yaml              |  5 ++---
 plans.fmf                | 16 ++++++++++++++++
 plans/tier1-internal.fmf | 10 ----------
 plans/tier1-public.fmf   |  7 -------
 5 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 ci.fmf
 create mode 100644 plans.fmf
 delete mode 100644 plans/tier1-internal.fmf
 delete mode 100644 plans/tier1-public.fmf

diff --git a/ci.fmf b/ci.fmf
deleted file mode 100644
index c5aa0e0..0000000
--- a/ci.fmf
+++ /dev/null
@@ -1 +0,0 @@
-resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index f4b9f11..7405cb7 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +1,7 @@
-#gating rhel
 --- !Policy
 product_versions:
   - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..304aebc
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,16 @@
+/public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/httpd.git
+      name: "^/plans/all$"
+
+/internal:
+  adjust:
+    - enabled: false
+      when: distro == centos-stream-10
+      because: "These tests should not run on CentOS Stream 10"
+  plan:
+    import:
+      url: https://gitlab.com/redhat/rhel/tests/httpd.git
+      name: "^/plans/mod_http2/(appstream|crb)$"
+      scope: all-plans
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 43ecc7c..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,10 +0,0 @@
-summary: Internal Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://gitlab.com/redhat/rhel/tests/httpd
-    filter: "tier:1"
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-10
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index c181caa..0000000
--- a/plans/tier1-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Public (Fedora) Tier1 beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/httpd.git
-    filter: 'tier: 1'
-execute:
-    how: tmt