summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkhandel <dkhandel@localhost.localdomain>2018-06-08 10:43:08 +0530
committerdkhandel <dkhandel@localhost.localdomain>2018-06-08 10:43:08 +0530
commite681d8bee868ca67ecf57c2250dc6a71a9239ad1 (patch)
tree6445297149980400bd6232103c520169b472ed31
parent16e692529380229dbc0462c756cb878b7cbebd88 (diff)
Move run-distributed-test.py to /opt/qa directory
Change-Id: I478ed5dc1070434a5e949d5d4b97d9db5b0f7367
-rw-r--r--build-gluster-org/scripts/distributed-regression.sh2
-rw-r--r--build-gluster-org/scripts/run-distributed-test.py25
2 files changed, 1 insertions, 26 deletions
diff --git a/build-gluster-org/scripts/distributed-regression.sh b/build-gluster-org/scripts/distributed-regression.sh
index 00fd1ae..c5782d3 100644
--- a/build-gluster-org/scripts/distributed-regression.sh
+++ b/build-gluster-org/scripts/distributed-regression.sh
@@ -24,7 +24,7 @@ do
done
# run the script of distributed-test
-../scripts/run-distributed-test.py
+/opt/qa/distributed-tests/run-distributed-test.py
ret=$?
if [ $ret -eq 0 ]; then
# Create tar file from all the failed test log files generated in /tmp
diff --git a/build-gluster-org/scripts/run-distributed-test.py b/build-gluster-org/scripts/run-distributed-test.py
deleted file mode 100644
index 820c3a0..0000000
--- a/build-gluster-org/scripts/run-distributed-test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-import subprocess
-import os
-from ansible.parsing.dataloader import DataLoader
-from ansible.vars.manager import VariableManager
-from ansible.inventory.manager import InventoryManager
-
-
-def get_ansible_host_ip():
- loader = DataLoader()
- inventory = InventoryManager(loader=loader, sources='hosts')
- variable_manager = VariableManager(loader=loader, inventory=inventory)
- hostnames = []
- for host in inventory.get_hosts():
- hostnames.append(variable_manager.get_vars(host=host))
- ip = ' '.join([str(i['ansible_host']) for i in hostnames])
- return str(ip)
-
-
-def main():
- ip = get_ansible_host_ip()
- subprocess.call(['./extras/distributed-testing/distributed-test.sh', '--hosts', '%s' % ip, '--id-rsa', 'key', '-v'])
-
-
-main()