X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FSetupFramework.py;h=810a16d06e8479cf8eda4d9be7a33d297d5362cb;hb=03984cf5e2affcb715559fad5f68b8ba165ff8cd;hp=880b1c94ce9595822b73a4faaf4769111f613346;hpb=4f0b7994d54b904dc3da2ada14c69e743df4d911;p=csit.git

diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index 880b1c94ce..810a16d06e 100644
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -14,6 +14,8 @@
 """This module exists to provide setup utilities for the framework on topology
 nodes. All tasks required to be run before the actual tests are started is
 supposed to end up here.
+
+TODO: Figure out how to export JSON from SSH outside main Robot thread.
 """
 
 from os import environ, remove
@@ -105,7 +107,7 @@ def extract_tarball_at_node(tarball, node):
         node, cmd,
         message=f"Failed to extract {tarball} at node {node[u'type']} "
         f"host {node[u'host']}, port {node[u'port']}",
-        timeout=60, include_reason=True
+        timeout=240, include_reason=True, export=False
     )
     logger.console(
         f"Extracting tarball to {con.REMOTE_FW_DIR} on {node[u'type']} "
@@ -116,9 +118,13 @@ def extract_tarball_at_node(tarball, node):
 def create_env_directory_at_node(node):
     """Create fresh virtualenv to a directory, install pip requirements.
 
+    Return stdout and stderr of the command,
+    so we see which installs are behaving weird (e.g. attempting download).
+
     :param node: Node to create virtualenv on.
     :type node: dict
-    :returns: nothing
+    :returns: Stdout and stderr.
+    :rtype: str, str
     :raises RuntimeError: When failed to setup virtualenv.
     """
     logger.console(
@@ -129,8 +135,8 @@ def create_env_directory_at_node(node):
         f"-p $(which python3) --system-site-packages --never-download env " \
         f"&& source env/bin/activate && ANSIBLE_SKIP_CONFLICT_CHECK=1 " \
         f"pip3 install -r requirements.txt"
-    exec_cmd_no_error(
-        node, cmd, timeout=100, include_reason=True,
+    stdout, stderr = exec_cmd_no_error(
+        node, cmd, timeout=100, include_reason=True, export=False,
         message=f"Failed install at node {node[u'type']} host {node[u'host']}, "
         f"port {node[u'port']}"
     )
@@ -138,6 +144,7 @@ def create_env_directory_at_node(node):
         f"Virtualenv setup on {node[u'type']} host {node[u'host']}, "
         f"port {node[u'port']} done."
     )
+    return stdout, stderr
 
 
 def setup_node(node, tarball, remote_tarball, results=None, logs=None):
@@ -160,7 +167,10 @@ def setup_node(node, tarball, remote_tarball, results=None, logs=None):
         copy_tarball_to_node(tarball, node)
         extract_tarball_at_node(remote_tarball, node)
         if node[u"type"] == NodeType.TG:
-            create_env_directory_at_node(node)
+            stdout, stderr = create_env_directory_at_node(node)
+            if isinstance(logs, list):
+                logs.append(f"{node[u'host']} Env stdout: {stdout}")
+                logs.append(f"{node[u'host']} Env stderr: {stderr}")
     except Exception:
         # any exception must result in result = False
         # since this runs in a thread and can't be caught anywhere else
@@ -206,7 +216,7 @@ def delete_framework_dir(node):
         node, f"sudo rm -rf {con.REMOTE_FW_DIR}",
         message=f"Framework delete failed at node {node[u'type']} "
         f"host {node[u'host']}, port {node[u'port']}",
-        timeout=100, include_reason=True
+        timeout=100, include_reason=True, export=False
     )
     logger.console(
         f"Deleting framework directory on {node[u'type']} host {node[u'host']},"