From d1c4bc9bcf251c6731cdb61d1868ad0b6e8336db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Hrdina?= <fhrdina@redhat.com>
Date: Wed, 10 Jul 2024 08:47:49 +0200
Subject: [PATCH] Update fmf plans and gating

---
 gating.yaml              | 26 +++++++++++++++++++++-----
 nmap.spec                |  5 ++++-
 plans.fmf                | 36 ++++++++++++++++++++++++++++++++++++
 plans/public.fmf         |  7 -------
 plans/tier1-internal.fmf | 15 ---------------
 5 files changed, 61 insertions(+), 28 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 b2f3e6a..1b16508 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -1,9 +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: 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/nmap.spec b/nmap.spec
index 8ee782a..947d34c 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -7,7 +7,7 @@ Name: nmap
 Epoch: 3
 Version: 7.92
 #global prerelease TEST5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Network exploration tool and security scanner
 URL: http://nmap.org/
 # Uses combination of licenses based on GPL license, but with extra modification
@@ -154,6 +154,9 @@ fi
 %{_mandir}/man1/ncat.1.gz
 
 %changelog
+* Wed Jul 10 2024 František Hrdina <fhrdina@redhat.com> - 3:7.92-3
+- Update fmf plans and gating
+
 * Tue Jul 09 2024 Martin Osvald <mosvald@redhat.com> - 3:7.92-2
 - Support EMS in ssl-enum-ciphers
 
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..08544b6
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/nmap.git
+      name: /plans/others/public
+
diff --git a/plans/public.fmf b/plans/public.fmf
deleted file mode 100644
index 52d7bf5..0000000
--- a/plans/public.fmf
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: Test plan that runs all tests from tests repo.
-discover:
-    how: fmf
-    url: https://src.fedoraproject.org/tests/nmap.git
-execute:
-    how: tmt
-
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
deleted file mode 100644
index 4511244..0000000
--- a/plans/tier1-internal.fmf
+++ /dev/null
@@ -1,15 +0,0 @@
-summary: CI plan, picks Tier1 tests, runs in beakerlib.
-discover:
-  - name: rhel
-    how: fmf
-    filter: 'tier: 1'
-    url: git://pkgs.devel.redhat.com/tests/nmap
-  - name: fedora
-    how: fmf
-    filter: 'tier: 1'
-    url: "https://src.fedoraproject.org/tests/nmap.git"
-execute:
-    how: tmt
-adjust:
-    enabled: false
-    when: distro == centos-stream-9