Attempt to fix journalctl

- AWK
- ECHO
- pipe
+ Much simpler

Change-Id: I4876f4eae68c96571dc38fd21e53ba269f5f888e
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 431ccfb..49c3d41 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -35,9 +35,9 @@ class DUTSetup:
         """
         command = u"echo $(< /tmp/*supervisor*.log)"\
             if DUTSetup.running_in_container(node) \
-            else f"journalctl --no-pager --unit={service} " \
-            f"--since=\"$(echo `systemctl show -p ActiveEnterTimestamp " \
-            f"{service}` | awk \'{{print $2 $3}}\')\""
+            else f"journalctl --no-pager _SYSTEMD_INVOCATION_ID=$(systemctl " \
+            f"show -p InvocationID --value {service})"
+
         message = f"Node {node[u'host']} failed to get logs from unit {service}"
 
         exec_cmd_no_error(