diff options
| author |   boucherv <valentin.boucher@orange.com> | 2016-01-12 10:55:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 10:55:01 +0000 |
| commit | fd2d6e5b9fcfdf8cffb0aa4ea27568334cb374e8 (patch) | |
| tree | d57d620b9174893ced01d8b14739fa3e9e0f0cce /testcases/vIMS | |
| parent | 5c0e095139fcc8131db0df64086edfe1d6b43a22 (diff) | |
| parent | 65f24166f10f7b8ba0e53591b2c88b11388dec9c (diff) | |
Merge "Add timeout for cloudify-manager deployment"
Diffstat (limited to 'testcases/vIMS')
| -rw-r--r-- | testcases/vIMS/CI/orchestrator.py | 6 | ||||
| -rw-r--r-- | testcases/vIMS/CI/vIMS.py | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py index c62cba4f7..ab0b448fa 100644 --- 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 94679f02a..98cc009cf 100644 --- 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, |