Move to tmt test framework

.fmf/version

@@ -0,0 +1 @@
+1

iscsi-initiator-utils.spec

@@ -13,7 +13,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 6.git%{shortcommit0}%{?dist}
+Release: 7.git%{shortcommit0}%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -364,6 +364,9 @@ fi
 %{python3_sitearch}/*
 
 %changelog
+* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-7.git095f59c
+- move tests to tmt framework
+
 * Tue Jun 13 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-6.git095f59c
 - restore missing gating tests
 

plans/sanity.fmf

@@ -0,0 +1,5 @@
+summary: Run relevant tests from the tests directory
+discover:
+  how: fmf
+execute:
+  how: tmt

plans/sts.fmf

@@ -0,0 +1,21 @@
+summary: Tier 0 iSCSI initiator tests
+discover:
+  how: fmf
+  url: https://gitlab.com/rh-kernel-stqe/sts
+  ref: fedora
+  filter:
+    - tier:0
+    - tag:iscsi
+    - tag:local
+context:
+  component: iscsi-initiator-utils
+execute:
+  how: tmt
+environment:
+  STS_VENV_PATH: /opt/sts-venv
+prepare:
+  - name: install-sts-libs
+    how: shell
+    script: >
+        curl --retry 3 --retry-delay 5 --connect-timeout 10 --max-time 30 -s
+        https://gitlab.com/rh-kernel-stqe/sts/-/raw/fedora/scripts/install-sts-libs.sh | bash

tests/iscsi-target-initiator-restraint/main.fmf

@@ -0,0 +1,13 @@
+summary: Creates iSCSI target/initiator, and logs it in locally
+description: ''
+contact: Andy Walsh <awalsh@redhat.com>
+component:
+  - iscsi-initiator-utils 
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - test_beakertask
+duration: 5m
+extra-summary: /beaker_nvr_test
+extra-task: /beaker_nvr_test
+tier: 0

tests/iscsi-target-initiator-restraint/runtest.sh

@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 # Set up a target IQN to use through the test.

tests/tests.yml

@@ -1,37 +0,0 @@
----
-# Tests suitable to run in classic environment
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    tests:
-    - iscsi-target-initiator-restraint
-    required_packages:
-    - targetcli
-
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    # python-stqe cannot be installed on 'atomic', no need to run on 'container'
-    tags:
-    - classic
-    repositories:
-    - repo: "https://gitlab.com/rh-kernel-stqe/python-stqe.git"
-      dest: "python-stqe"
-      version: 535ecebf5611e158079d806b6232e3d2c68f0d93
-    tests:
-    # Install python-stqe first
-    # make sure we use same version of libsan
-    - install_stqe:
-        dir: python-stqe
-        run: pip3 install libsan==0.3.0 && python3 setup.py install --prefix=
-    - iscsi-initiator-utils:
-        dir: ./
-        run: stqe-test run -t iscsi/iscsi_params.py
-    required_packages:
-    # required for python-stqe
-    - python3-pyyaml
-    - python3-netifaces
-    - python3-augeas
-    - python3-pip