From 2c297f0cb2375932edc2d1dd8dbf549c36396ebf Mon Sep 17 00:00:00 2001
From: Milan Lysonek <mlysonek@redhat.com>
Date: Wed, 7 Aug 2024 12:06:55 +0200
Subject: [PATCH] Switch gating to tmt

Resolves: RHEL-43241
---
 ci.fmf          | 14 +-------------
 gating.yaml     |  5 ++---
 openscap.spec   |  5 ++++-
 plans/ci.fmf    | 12 ++++++++++++
 tests/tests.yml | 10 ----------
 5 files changed, 19 insertions(+), 27 deletions(-)
 create mode 100644 plans/ci.fmf
 delete mode 100644 tests/tests.yml

diff --git a/ci.fmf b/ci.fmf
index ef6db57..c5aa0e0 100644
--- a/ci.fmf
+++ b/ci.fmf
@@ -1,13 +1 @@
-summary: Merge Request CI tests
-discover:
-  - how: fmf
-    url: https://src.fedoraproject.org/tests/openscap.git
-    filter: 'tag: CI-Tier-1'
-adjust:
-  - when: distro == rhel
-    discover+:
-    - how: fmf
-      url: git://pkgs.devel.redhat.com/tests/openscap
-      filter: 'tag: CI-Tier-1'
-execute:
-  how: tmt
+resultsdb-testcase: separate
diff --git a/gating.yaml b/gating.yaml
index da188d9..1fec0e0 100644
--- a/gating.yaml
+++ b/gating.yaml
@@ -3,6 +3,5 @@ product_versions:
   - rhel-9
 decision_context: osci_compose_gate
 rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-beaker.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/default-hw-tier1.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/custom-hw-tier1.functional}
diff --git a/openscap.spec b/openscap.spec
index 3c4926c..22110e9 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -1,6 +1,6 @@
 Name:           openscap
 Version:        1.3.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Set of open source libraries enabling integration of the SCAP line of standards
 License:        LGPLv2+
@@ -198,6 +198,9 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm
 %{_bindir}/oscap-run-sce-script
 
 %changelog
+* Wed Aug 07 2024 Milan Lysonek <mlysonek@redhat.com> - 1:1.3.10-3
+- Switch gating to tmt plan (RHEL-43241)
+
 * Mon Apr 08 2024 Jan Černý <jcerny@redhat.com> - 1:1.3.10-2
 - Explicitely disable dpkginfo probe
 
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..4be8533
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,12 @@
+summary: CI test plan
+/default-hw-tier1:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openscap
+      name: /plans/gating/default-hw-tier1
+
+/custom-hw-tier1:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openscap
+      name: /plans/gating/custom-hw-tier1
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 1145677..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Tests that run in classic context
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/openscap.git"
-      dest: "openscap"
-      fmf_filter: "tier: 1, 2"