From de58d18b537207f5ce3deac997add8739772d40a Mon Sep 17 00:00:00 2001
From: Ondrej Mejzlik <omejzlik@redhat.com>
Date: Fri, 24 Mar 2023 14:03:33 +0000
Subject: [PATCH] Enable fmf tests

---
 ci.fmf                   | 14 +-------------
 gating.yaml              |  1 +
 plans/public.fmf         |  7 +++++++
 plans/tier1-internal.fmf | 15 +++++++++++++++
 tests/tests.yml          | 11 -----------
 5 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 plans/public.fmf
 create mode 100644 plans/tier1-internal.fmf
 delete mode 100644 tests/tests.yml

diff --git a/ci.fmf b/ci.fmf
index 9ef1d9d..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,13 +1 @@
-/test:
-    summary:
-        CI plan, picks Tier1 tests, runs in beakerlib.
-    description:
-        This special plan has to be named ci.fmf to run in CI.
-        It selects test which have 'tier 1' in their main.fmf file
-    discover:
-      - name: tier1
-        how: fmf
-        filter: 'tier: 1'
-        url: "https://src.fedoraproject.org/tests/tcpdump.git"
-    execute:
-        how: beakerlib
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index 7cd5018..cb7e908 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -5,3 +5,4 @@ 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}
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..d6da3c5
--- /dev/null
+++ b/plans/public.fmf
@@ -0,0 +1,7 @@
+summary: Test plan that runs all tests from tests repo.
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/tcpdump.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..46f9f70
--- /dev/null
+++ b/plans/tier1-internal.fmf
@@ -0,0 +1,15 @@
+summary: CI plan, picks Tier1 tests, runs in beakerlib.
+discover:
+  - name: rhel
+    how: fmf
+    filter: 'tier: 1'
+    url: git://pkgs.devel.redhat.com/tests/tcpdump
+  - name: fedora
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/tcpdump.git"
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream-9
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 76443fc..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# This first play always runs on the local staging system
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/tcpdump.git"
-      dest: "tcpdump"
-      fmf_filter: "tier: 1"