Revert "Fix runtestmanager for CICD deployments"
This reverts commit 70cefed6f2de0d31eaeadff55713bec5e3d763d8.
Change-Id: Ie9087cda7102b2bfd4d0e1b5d4dacc66cc4648be
diff --git a/tcp_tests/managers/execute_commands.py b/tcp_tests/managers/execute_commands.py
index 193153c..adb76dc 100644
--- a/tcp_tests/managers/execute_commands.py
+++ b/tcp_tests/managers/execute_commands.py
@@ -87,7 +87,6 @@
retry_count = retry.get('count', 1)
retry_delay = retry.get('delay', 1)
skip_fail = step.get('skip_fail', False)
- timeout = step.get('timeout', None)
with self.__underlay.remote(node_name=node_name) as remote:
@@ -102,7 +101,7 @@
LOG.info("\n\n{0}\n{1}".format(
msg + retry_msg, '=' * len(msg + retry_msg)))
- result = remote.execute(cmd, timeout=timeout, verbose=True)
+ result = remote.execute(cmd, verbose=True)
if return_res:
return result
@@ -149,7 +148,6 @@
retry_count = retry.get('count', 1)
retry_delay = retry.get('delay', 1)
skip_fail = step.get('skip_fail', False)
- timeout = step.get('timeout', None)
if not bool(state) ^ bool(states):
raise ValueError("You should use state or states in step")
@@ -167,7 +165,7 @@
method = getattr(self._salt, self._salt._map[do])
command_ret = method(tgt=target, state=state or states,
- args=args, kwargs=kwargs, timeout=timeout)
+ args=args, kwargs=kwargs)
command_ret = command_ret if \
isinstance(command_ret, list) else [command_ret]
results = [(r['return'][0], f) for r, f in command_ret]