diff options
Diffstat (limited to 'func')
| -rw-r--r-- | func/cli.py | 3 | ||||
| -rw-r--r-- | func/driver.py | 2 | ||||
| -rw-r--r-- | func/env_setup.py | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/func/cli.py b/func/cli.py index 87b205a0..833e3740 100644 --- a/func/cli.py +++ b/func/cli.py @@ -28,6 +28,7 @@ class cli(): xindex= filepath[suites].find('.') filepath[suites]=filepath[suites][0:xindex] return filepath + def __init__(self): suite=[] parser = argparse.ArgumentParser() @@ -50,7 +51,7 @@ class cli(): if os.path.isfile('./test_cases/'+args.lab.lower()+'/'+suite[0]+'/' +benchmarks[items]): [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/' +args.lab.lower()+'/'+suite[0]+'/'+benchmarks[items]) - + if len(vm_info) != 0: vmObj ='' vmObj = SpawnVM(vm_info) diff --git a/func/driver.py b/func/driver.py index 318c67b3..2cdddba5 100644 --- a/func/driver.py +++ b/func/driver.py @@ -43,7 +43,7 @@ class Driver: index= index+1 dic_json = json.dumps(dict(self.dic_json.items())) print dic_json - run_play = 'ansible-playbook -s ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' '.format(benchmark_name, dic_json) + run_play = 'ansible-playbook -s ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' -v '.format(benchmark_name, dic_json) # run_play = 'ansible-playbook -s $PWD/benchmarks/playbooks/{0} --extra-vars "Dest_dir={1} role={2}" -vvv'.format( # benchmark_name, result_dir, k) status = os.system(run_play) diff --git a/func/env_setup.py b/func/env_setup.py index c0e1b539..5676d05b 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -56,7 +56,6 @@ class Env_setup(): time.sleep(2) ssh_c = 'ssh-keyscan {0} >> ~/.ssh/known_hosts'.format(k) - os.system(ssh_c) ssh_cmd = './data/qtip_creds.sh {0}'.format(ipvar) print ssh_cmd @@ -70,7 +69,7 @@ class Env_setup(): print('SSH successful') break except: - print 'Retrying SSH' + print 'Retrying aSSH' time.sleep(1) if v == '': print ('SSH->>>>>', k) |