From 23e658dc1fa1c8d154b667df7090467bb9851182 Mon Sep 17 00:00:00 2001
From: Milos Malik <mmalik@redhat.com>
Date: Mon, 11 Jul 2022 16:37:37 +0200
Subject: [PATCH] run Tier1 tests via TMT/FMF

Use the TMT/FMF instead of STI for running tests. STI does not respect
the adjust section in main.fmf files of stored tests.

Related: rhbz#2107109
---
 .fmf/version                                   |  1 +
 plans/tests.fmf                                |  6 ++++++
 .../use-of-aliases-in-plugins/main.fmf         | 18 ++++++++++++++++++
 .../use-of-aliases-in-plugins/runtest.sh       |  1 -
 tests/tests.yml                                | 11 -----------
 5 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/tests.fmf
 create mode 100644 tests/Regression/use-of-aliases-in-plugins/main.fmf
 delete mode 100644 tests/tests.yml

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/plans/tests.fmf b/plans/tests.fmf
new file mode 100644
index 0000000..7660eaf
--- /dev/null
+++ b/plans/tests.fmf
@@ -0,0 +1,6 @@
+summary: Tier 1 setroubleshoot-plugins test plan
+discover:
+    how: fmf
+execute:
+    how: tmt
+
diff --git a/tests/Regression/use-of-aliases-in-plugins/main.fmf b/tests/Regression/use-of-aliases-in-plugins/main.fmf
new file mode 100644
index 0000000..e27cd7a
--- /dev/null
+++ b/tests/Regression/use-of-aliases-in-plugins/main.fmf
@@ -0,0 +1,18 @@
+summary: Make sure all types used in setroubleshoot plugins are defined in the policy
+    and are not aliases
+contact: Vit Mojzis <vmojzis@redhat.com>
+component:
+  - setroubleshoot-plugins
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - git
+  - libselinux-utils
+  - setroubleshoot-plugins
+  - policycoreutils
+  - selinux-policy-targeted
+  - python3-policycoreutils
+  - /usr/bin/python3
+duration: 10m
+extra-summary: /CoreOS/setroubleshoot-plugins/Regression/use-of-aliases-in-plugins
+extra-task: /CoreOS/setroubleshoot-plugins/Regression/use-of-aliases-in-plugins
diff --git a/tests/Regression/use-of-aliases-in-plugins/runtest.sh b/tests/Regression/use-of-aliases-in-plugins/runtest.sh
index 5720f99..b540e6b 100755
--- a/tests/Regression/use-of-aliases-in-plugins/runtest.sh
+++ b/tests/Regression/use-of-aliases-in-plugins/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="setroubleshoot-plugins"
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index cc1af99..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    tests:
-    - Regression/use-of-aliases-in-plugins
-    required_packages:
-    - setroubleshoot-plugins
-    - selinux-policy-targeted
-    - python3-policycoreutils