From 2100a53b44a5a6f034856a49d1241cb0acad946c Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Tue, 19 Nov 2019 18:25:08 -0200
Subject: [PATCH] Fix packit / TMT tests.

---
 .fmf/version                                                  | 1 +
 ci.fmf                                                        | 4 ++++
 .../bz1416712-Tuned-logs-error-message-if/main.fmf            | 0
 .../bz1416712-Tuned-logs-error-message-if/runtest.sh          | 1 -
 tests/main.fmf                                                | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .fmf/version
 create mode 100644 ci.fmf
 rename tests/{beakerlib => }/bz1416712-Tuned-logs-error-message-if/main.fmf (100%)
 rename tests/{beakerlib => }/bz1416712-Tuned-logs-error-message-if/runtest.sh (98%)
 create mode 100644 tests/main.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/ci.fmf b/ci.fmf
new file mode 100644
index 00000000..4f813e0d
--- /dev/null
+++ b/ci.fmf
@@ -0,0 +1,4 @@
+discover:
+    how: fmf
+execute:
+    how: beakerlib
diff --git a/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf b/tests/bz1416712-Tuned-logs-error-message-if/main.fmf
similarity index 100%
rename from tests/beakerlib/bz1416712-Tuned-logs-error-message-if/main.fmf
rename to tests/bz1416712-Tuned-logs-error-message-if/main.fmf
diff --git a/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh b/tests/bz1416712-Tuned-logs-error-message-if/runtest.sh
similarity index 98%
rename from tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh
rename to tests/bz1416712-Tuned-logs-error-message-if/runtest.sh
index e33f5a37..9c3ff8c6 100755
--- a/tests/beakerlib/bz1416712-Tuned-logs-error-message-if/runtest.sh
+++ b/tests/bz1416712-Tuned-logs-error-message-if/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="tuned"
diff --git a/tests/main.fmf b/tests/main.fmf
new file mode 100644
index 00000000..55bcc7dc
--- /dev/null
+++ b/tests/main.fmf
@@ -0,0 +1 @@
+test: ./runtest.sh