From d65a51467c5bd23b4b20496a3ec0c7dad2e4a53b Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Thu, 27 Apr 2023 18:26:11 +0000
Subject: [PATCH] Separate public and private tests and update gating
 accordingly

Gating also covers Fedora, so the gating.yaml files are the same

Resolves: RHELPLAN-155186
---
 ci.fmf             |  1 +
 gating.yaml        | 25 +++++++++++++++++++++++--
 plan.fmf           | 20 --------------------
 plans/internal.fmf | 12 ++++++++++++
 plans/public.fmf   |  7 +++++++
 5 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 ci.fmf
 delete mode 100644 plan.fmf
 create mode 100644 plans/internal.fmf
 create mode 100644 plans/public.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 9d4695d..dbde1aa 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,6 +1,27 @@
+# Branched Fedora (non-Rawhide)
 --- !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/public.functional}
+
+
+# Rawhide Fedora
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !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: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/internal.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/public.functional}
diff --git a/plan.fmf b/plan.fmf
deleted file mode 100644
index 956251e..0000000
--- a/plan.fmf
+++ /dev/null
@@ -1,20 +0,0 @@
-/public:
-    summary: Public (Fedora) beakerlib tests
-    discover:
-        how: fmf
-        url: https://src.fedoraproject.org/tests/zlib.git
-    execute:
-        how: tmt
-
-/private:
-    enabled: false
-    adjust:
-    - when: distro == rhel
-      enabled: true
-      because: private tests are accesible only within rhel pipline
-
-    discover:
-	how: fmf
-	url: https://pkgs.devel.redhat.com/cgit/tests/zlib.git
-    execute:
-	how: tmt
diff --git a/plans/internal.fmf b/plans/internal.fmf
new file mode 100644
index 0000000..c013f71
--- /dev/null
+++ b/plans/internal.fmf
@@ -0,0 +1,12 @@
+summary: Private (RHEL) beakerlib tests
+enabled: false
+adjust:
+  - when: distro == rhel
+    enabled: true
+    because: private tests are accesible only within rhel pipline
+discover:
+  - name: rhel
+    how: fmf
+    url: git://pkgs.devel.redhat.com/tests/zlib
+execute:
+    how: tmt
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..cf84547
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Public (Fedora) beakerlib tests
+discover:
+  - name: fedora
+    how: fmf
+    url: https://src.fedoraproject.org/tests/zlib.git
+execute:
+    how: tmt