From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 11 Nov 2020 13:50:59 +0000 (+0100)
Subject: install m2crypto as part of sfa-start
X-Git-Url: http://git.onelab.eu/?p=tests.git;a=commitdiff_plain;h=78df7cdfb03269440ded832e2f3bb51d0d5d3ce6

install m2crypto as part of sfa-start
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 199fae6..13e0e2f 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1711,16 +1711,25 @@ class TestPlc:
         return self.run_in_guest('sfaadmin reg import_registry') == 0
 
     def sfa_start(self):
-        "start SFA through systemctl"
-        sfa_dependencies = [
+        "start SFA through systemctl - also install dependencies"
+
+        # installing this one through pip2 is a pain, it is a source install
+        # and requires a python2 devel environment so let's kep it simple
+        dnf_dependencies = [
+            "m2crypto"
+        ]
+        pip_dependencies = [
             'sqlalchemy-migrate',
             'lxml',
             'python-dateutil',
             'psycopg2-binary',
         ]
-        deps = all((self.run_in_guest(f"pip2 install {dep}") == 0) 
-                   for dep in sfa_dependencies)
-        return (deps
+        dnf_deps = all((self.run_in_guest(f"dnf -y install {dep}") == 0)
+                   for dep in dnf_dependencies)
+        pip_deps = all((self.run_in_guest(f"pip2 install {dep}") == 0)
+                   for dep in pip_dependencies)
+        return (dnf_deps 
+            and pip_deps
             and self.start_stop_systemd('sfa-registry', 'start')
             and self.start_stop_systemd('sfa-aggregate', 'start'))