From c4904fe81b4c48ded667c2af43095ff159e9f181 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 13 Aug 2025 13:48:56 +0200
Subject: [PATCH] Migrate FMF tests into metadata format used in rhel-stacks

---
 gating.yaml            |  7 +++++--
 plans.fmf              | 36 ++++++++++++++++++++++++++++++++++++
 plans/tier1-public.fmf |  7 -------
 plans/tier2-public.fmf |  7 -------
 4 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 plans.fmf
 delete mode 100644 plans/tier1-public.fmf
 delete mode 100644 plans/tier2-public.fmf

diff --git a/gating.yaml b/gating.yaml
index a49f4d3..5214e65 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,7 +5,7 @@ decision_contexts: [bodhi_update_push_testing]
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier2-public.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier2-tier3-public.functional}
 
 #gating rawhide
 --- !Policy
@@ -15,7 +15,7 @@ decision_contexts: [bodhi_update_push_stable]
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier2-public.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier2-tier3-public.functional}
 
 #gating rhel
 --- !Policy
@@ -24,3 +24,6 @@ product_versions:
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier2-tier3-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier2-tier3-internal.functional}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..1d8d459
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/sscg.git
+      name: /plans/others/public
+
diff --git a/plans/tier1-public.fmf b/plans/tier1-public.fmf
deleted file mode 100644
index 5a48a8f..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/sscg.git
-    filter: 'tier: 1'
-execute:
-    how: tmt
diff --git a/plans/tier2-public.fmf b/plans/tier2-public.fmf
deleted file mode 100644
index 5507332..0000000
--- a/plans/tier2-public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Public (Fedora) Tier2 beakerlib tests
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/sscg.git
-    filter: 'tier: 2'
-execute:
-    how: tmt