From b31d1f319f4e5ccf57de379db79824ae23ee12e9 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Thu, 19 Jan 2023 12:05:45 +0100
Subject: [PATCH] Resolves: #2160648 - Enhanced TMT testing for centos-stream

---
 ci.fmf                   | 14 +-------------
 plans/public.fmf         |  7 +++++++
 plans/tier1-internal.fmf | 15 +++++++++++++++
 rpminspect.yaml          |  9 +++++++++
 wireshark.spec           |  5 ++++-
 5 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 plans/public.fmf
 create mode 100644 plans/tier1-internal.fmf
 create mode 100644 rpminspect.yaml

diff --git a/ci.fmf b/ci.fmf
index d6542da..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/wireshark.git"
-    execute:
-        how: beakerlib
+resultsdb-testcase: separate
diff --git a/plans/public.fmf b/plans/public.fmf
new file mode 100644
index 0000000..f8c7f4f
--- /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/wireshark.git
+execute:
+    how: tmt
+
diff --git a/plans/tier1-internal.fmf b/plans/tier1-internal.fmf
new file mode 100644
index 0000000..31bf329
--- /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/wireshark
+  - name: fedora
+    how: fmf
+    filter: 'tier: 1'
+    url: "https://src.fedoraproject.org/tests/wireshark.git"
+execute:
+    how: tmt
+adjust:     
+    enabled: false     
+    when: distro == centos-stream-9
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..a3d3d52
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,9 @@
+---
+ownership:
+  bin_paths:
+    - /usr/bin/dumpcap
+
+  bin_group: wireshark
+
+inspections:
+  xml: off
diff --git a/wireshark.spec b/wireshark.spec
index 8959424..2667698 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -6,7 +6,7 @@
 Summary:	Network traffic analyzer
 Name:		wireshark
 Version:	3.4.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Epoch:		1
 License:	GPL+
 Url:		http://www.wireshark.org/
@@ -271,6 +271,9 @@ fi
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Thu Jan 19 2023 Michal Ruprich <mruprich@redhat.com> - 1:3.4.10-2
+- Resolves: #2160648 - Enhanced TMT testing for centos-stream
+
 * Thu Dec 16 2021 Michal Ruprich <mruprich@redhat.com> - 1:3.4.10-1
 - Resolves: #2032966 - Rebase wireshark to fix multiple CVEs