From 08a5b8042dc6d97cdefea10382e2c162abdf8a91 Mon Sep 17 00:00:00 2001
From: Ondrej Mejzlik <omejzlik@redhat.com>
Date: Mon, 17 Apr 2023 18:47:07 +0200
Subject: [PATCH] Adding fmf plans and gating

---
 ci.fmf                   |  1 +
 gating.yaml              | 21 ++++++++++++++++-----
 plans/ci.fmf             |  6 ------
 plans/public.fmf         |  6 ++++++
 plans/tier1-internal.fmf | 12 ++++++++++++
 5 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 ci.fmf
 delete mode 100644 plans/ci.fmf
 create mode 100644 plans/public.fmf
 create mode 100644 plans/tier1-internal.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 f458db9..de5c323 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,16 +1,27 @@
 --- !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}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/public.functional}
 
-# rawhide
+#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}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/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: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
diff --git a/plans/ci.fmf b/plans/ci.fmf
deleted file mode 100644
index 7834d37..0000000
--- a/plans/ci.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Test plan that runs all tests from tests repo.
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/chrony.git
-execute:
-    how: tmt
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..cff1391
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,6 @@
+summary: Test plan with all Fedora tests
+discover:
+       how: fmf
+       url: https://src.fedoraproject.org/tests/chrony.git
+execute:
+       how: tmt
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..9714336
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,12 @@
+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/chrony
+execute:
+    how: tmt 
+adjust:
+    enabled: false
+    when: distro == centos-stream, fedora
+    because: They don't have access to internal repos.