Merge "Add timeout for cloudify-manager deployment"

diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py
index c62cba4..ab0b448 100644 (file)
--- a/testcases/vIMS/CI/orchestrator.py
+++ b/testcases/vIMS/CI/orchestrator.py
@@ -91,14 +91,14 @@ class orchestrator:
 
             if self.logger:
                 self.logger.info("Launching the cloudify-manager deployment")
-
-            script = "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
+            script =  "set -e; "
+            script += "source " + self.testcase_dir + "venv_cloudify/bin/activate; "
             script += "cd " + self.testcase_dir + "; "
             script += "cfy init -r; "
             script += "cd cloudify-manager-blueprint; "
             script += "cfy local create-requirements -o requirements.txt -p openstack-manager-blueprint.yaml; "
             script += "pip install -r requirements.txt; "
-            script += "cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; "
+            script += "timeout 1800 cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; "
             cmd = "/bin/bash -c '" + script + "'"
             execute_command(cmd, self.logger)
 

diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index 94679f0..98cc009 100644 (file)
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -148,7 +148,6 @@ def test_clearwater():
             CW_INPUTS["public_domain"] + '] SIGNUP_CODE="secret"'
 
         cmd = "/bin/bash -c '" + script + "'"
-        print cmd
         output_file = "output.txt"
         f = open(output_file, 'w+')
         p = subprocess.call(cmd, shell=True, stdout=f,