From 7221339fd4cf4d4af4157ed0ecc661d93b46c99f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Wed, 17 Jul 2024 09:57:56 +0200
Subject: [PATCH] Update fmf plans and gating.yaml

---
 gating.yaml              | 27 +++++++++++++++++++++------
 plans.fmf                | 36 ++++++++++++++++++++++++++++++++++++
 plans/public.fmf         |  6 ------
 plans/tier1-internal.fmf | 12 ------------
 4 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 plans.fmf
 delete mode 100644 plans/public.fmf
 delete mode 100644 plans/tier1-internal.fmf

diff --git a/gating.yaml b/gating.yaml
index b648832..1b16508 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,10 +1,25 @@
 --- !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: baseos-ci.brew-build.tedude.validation}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
\ No newline at end of file
+  - !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..c338911
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/postfix.git
+      name: /plans/others/public
+
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index 5b892e7..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan with all Fedora tests
-discover:
-       how: fmf
-       url: https://src.fedoraproject.org/tests/postfix.git
-execute:
-       how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 8242b3e..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,12 +0,0 @@
-summary: CI plan, picks internal Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/postfix
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream or distro == fedora
-    because: They don't have access to internal repos.