From 3fa9d552d74e328a6607d5be89a4bddaa5910914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Fri, 21 Jun 2024 17:07:59 +0200
Subject: [PATCH] Update of fmf plans and gating for c10s

---
 ci.fmf        |  1 +
 gating.yaml   | 21 +++++++++++++++------
 plans.fmf     | 36 ++++++++++++++++++++++++++++++++++++
 plans/all.fmf |  6 ------
 4 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 ci.fmf
 create mode 100644 plans.fmf
 delete mode 100644 plans/all.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 1e0d08f..1b16508 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,25 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_testing]
+decision_context: bodhi_update_push_testing
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
-#gating rawhide
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts: [bodhi_update_push_stable]
+decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
\ No newline at end of file
+  - !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: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
\ No newline at end of file
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..149c4b0
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/json-c.git
+      name: /plans/others/public
+
diff --git a/plans/all.fmf b/plans/all.fmf
deleted file mode 100644
index 9df04ff..0000000
--- a/plans/all.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-       how: fmf
-       url: https://src.fedoraproject.org/tests/json-c.git
-execute:
-       how: tmt