From 671dceea6a7c3d7f8a95c38af4108a01f7f6bfbe Mon Sep 17 00:00:00 2001
From: Tomas Korbar <tkorbar@redhat.com>
Date: Thu, 11 Jun 2026 15:04:27 +0200
Subject: [PATCH] Fix testing metadata

---
 ci.fmf          |  1 +
 gating.yaml     | 26 ++++++++++++++++++++++----
 plans.fmf       | 36 ++++++++++++++++++++++++++++++++++++
 plans/basic.fmf |  7 -------
 4 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 ci.fmf
 create mode 100644 plans.fmf
 delete mode 100644 plans/basic.fmf

diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 0000000..c5aa0e0
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1 @@
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 0fc6cfc..9b2646f 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,8 +1,26 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..7c03c08
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://gitlab.com/redhat/centos-stream/tests/memcached.git
+      name: /plans/others/public
+
diff --git a/plans/basic.fmf b/plans/basic.fmf
deleted file mode 100644
index 0a1c3d1..0000000
--- a/plans/basic.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary:
-    Verify that cheat works
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/memcached
-execute:
-    how: beakerlib