Merge pull request #1411 from vojtechtrefny/main_isicsi-startup

tests: Make sure iscsi-init.service is started for iSCSI tests

Author: vojtechtrefny

misc/blivet-tasks.yml

@@ -51,6 +51,7 @@
       - stratisd
       - stratis-cli
       - libblockdev-tools
+      - udisks2-iscsi
   when: ansible_distribution == 'Fedora' and test_dependencies|bool
 
 ####### CentOS 9/10
@@ -99,6 +100,7 @@
       - stratisd
       - stratis-cli
       - libblockdev-tools
+      - udisks2-iscsi
   when: ansible_distribution == 'CentOS' and test_dependencies|bool
 
 - name: Install additional test dependencies (CentOS 9)

plans/tests.fmf

@@ -25,5 +25,5 @@ prepare:
 execute:
     how: tmt
     script:
-      - sudo python3 tests/run_tests.py -l
+      - sudo python3 tests/run_tests.py -l -j
       - tmt-file-submit -l /tmp/blivet.log

tests/run_tests.py

@@ -228,10 +228,16 @@ def addFailure(self, test, err):  # pylint: disable=redefined-outer-name
     argparser.add_argument("-d", "--log-dir", dest="logdir",
                            help="directory for saving the logs (defaults to /tmp)",
                            action="store")
+    argparser.add_argument("-j", "--jenkins", dest="jenkins",
+                           help="run also tests that should run only in a CI environment",
+                           action="store_true")
     args = argparser.parse_args()
 
     testdir = os.path.abspath(os.path.dirname(__file__))
 
+    if args.jenkins:
+        os.environ["JENKINS_HOME"] = testdir  # pylint: disable=environment-modify
+
     import blivet
     print("Running tests with Blivet %s from %s" % (blivet.__version__,
                                                     os.path.abspath(os.path.dirname(blivet.__file__))),

tests/storage_tests/iscsi_test.py

@@ -112,6 +112,8 @@ def setUp(self):
         except RuntimeError as e:
             raise RuntimeError("Failed to setup targetcli device for testing: %s" % e)
 
+        subprocess.call(["systemctl", "start", "iscsi-init.service"], stdout=subprocess.DEVNULL)
+
     def _force_logout(self):
         subprocess.call(["iscsiadm", "--mode", "node", "--logout", "--name", self.dev], stdout=subprocess.DEVNULL)