summaryrefslogtreecommitdiffstats
path: root/doctor_tests/installer/base.py
diff options
context:
space:
mode:
authorTomi Juvonen <tomi.juvonen@nokia.com>2018-12-21 12:43:57 +0200
committerTomi Juvonen <tomi.juvonen@nokia.com>2019-03-26 15:53:28 +0200
commit73605c5c34b97ab56306bfa9af0f5888f3c7e46d (patch)
tree7175ebaec5ed949d32ee62b7ac412729b366446e /doctor_tests/installer/base.py
parent33293e9c23a21ad3228f46d2063f18c915eb2b79 (diff)
Support Fenix as admin tool
If ADMIN_TOOL_TYPE=fenix we run maintenance testing using Fenix instead of sample implementation. Testing will build Fenix Docker container from latest master and make configuration according to controller host. JIRA: DOCTOR-131 Change-Id: I84c566b7afc3c4e488aeed63b5cf5c75046d1427 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
Diffstat (limited to 'doctor_tests/installer/base.py')
-rw-r--r--doctor_tests/installer/base.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/doctor_tests/installer/base.py b/doctor_tests/installer/base.py
index df781ee1..7e2658e5 100644
--- a/doctor_tests/installer/base.py
+++ b/doctor_tests/installer/base.py
@@ -209,8 +209,13 @@ class BaseInstaller(object):
except:
client.scp(script_abs_path, script_name)
try:
- cmd = 'sudo %s %s' % (python, script_name)
+ if ".py" in script_name:
+ cmd = 'sudo %s %s' % (python, script_name)
+ else:
+ cmd = 'sudo chmod 700 %s;sudo ./%s' % (script_name,
+ script_name)
ret, output = client.ssh(cmd)
+ self.log.info('Command %s output %s' % (cmd, output))
except:
ret, output = client.ssh(cmd)