From c19eac206676b65311c3ca33cb00b0ae9dc54d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Mon, 14 Oct 2024 14:29:35 +0200
Subject: [PATCH] Update fmf plans and gating.yaml

---
 ci.fmf          |  1 +
 gating.yaml     | 23 +++++++++++++++++++++--
 plans.fmf       | 36 ++++++++++++++++++++++++++++++++++++
 plans/tier1.fmf | 16 ----------------
 4 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 ci.fmf
 create mode 100644 plans.fmf
 delete mode 100644 plans/tier1.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 4ca9235..b8d65b0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,25 @@
 --- !Policy
 product_versions:
-  - rhel-10
+  - 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: osci.brew-build.tier0.functional}
+  - !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..814828a
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/rootfiles.git
+      name: /plans/others/public
+
diff --git a/plans/tier1.fmf b/plans/tier1.fmf
deleted file mode 100644
index b6961ae..0000000
--- a/plans/tier1.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
----
-
-summary: Tier1 plan for rootfiles
-
-discover:
-  how: fmf
-  url: https://pkgs.devel.redhat.com/git/tests/rootfiles
-  ref: master
-  filter: tier:1
-
-execute:
-  how: tmt
-
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora