summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasledzinskiy <asledzinskiy@mirantis.com>2016-12-22 13:52:03 +0200
committerasledzinskiy <asledzinskiy@mirantis.com>2016-12-22 13:52:03 +0200
commit89c8319b9b463bc70c0467868dc209b6e3276e20 (patch)
treee6273ce82d8366d1dec463cd159eae5a3a37a7bf
parent616b57376288a87f88164aca829d0b68e4bde0d8 (diff)
Remove custom timeouts in few_os tests
- We have default timeout for deployment bigger than we used in few_os tests so it's better to stick to default Change-Id: I58f04ee23a10c32053087832b843372a0a1a5150
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Dennis Dmitriev <ddmitriev@mirantis.com> Workflow+1: Andrey Sledzinskiy <asledzinskiy@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 22 Dec 2016 12:47:29 +0000 Reviewed-on: https://review.openstack.org/414062 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/tests/system/test_few_os.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py
index f3274c2..dc4a02b 100644
--- a/fuel_ccp_tests/tests/system/test_few_os.py
+++ b/fuel_ccp_tests/tests/system/test_few_os.py
@@ -62,7 +62,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
62 underlay.sudo_check_call("pip install python-openstackclient", 62 underlay.sudo_check_call("pip install python-openstackclient",
63 host=config.k8s.kube_host) 63 host=config.k8s.kube_host)
64 ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) 64 ccpcluster.deploy(params={"config-file": "./config_1.yaml"})
65 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) 65 post_os_deploy_checks.check_jobs_status(k8s_actions.api)
66 post_os_deploy_checks.check_pods_status(k8s_actions.api) 66 post_os_deploy_checks.check_pods_status(k8s_actions.api)
67 remote.check_call( 67 remote.check_call(
68 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 68 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
@@ -83,7 +83,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
83 '/tmp/1ctrl_1comp_diff.yaml']) 83 '/tmp/1ctrl_1comp_diff.yaml'])
84 84
85 ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) 85 ccpcluster.deploy(params={"config-file": "./config_2.yaml"})
86 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, 86 post_os_deploy_checks.check_jobs_status(k8s_actions.api,
87 namespace="ccp-second") 87 namespace="ccp-second")
88 post_os_deploy_checks.check_pods_status(k8s_actions.api, 88 post_os_deploy_checks.check_pods_status(k8s_actions.api,
89 namespace="ccp-second") 89 namespace="ccp-second")
@@ -130,7 +130,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
130 underlay.sudo_check_call("pip install python-openstackclient", 130 underlay.sudo_check_call("pip install python-openstackclient",
131 host=config.k8s.kube_host) 131 host=config.k8s.kube_host)
132 ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) 132 ccpcluster.deploy(params={"config-file": "./config_1.yaml"})
133 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) 133 post_os_deploy_checks.check_jobs_status(k8s_actions.api)
134 post_os_deploy_checks.check_pods_status(k8s_actions.api) 134 post_os_deploy_checks.check_pods_status(k8s_actions.api)
135 remote.check_call( 135 remote.check_call(
136 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 136 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
@@ -151,7 +151,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
151 '/tmp/1ctrl_1comp_same.yaml']) 151 '/tmp/1ctrl_1comp_same.yaml'])
152 152
153 ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) 153 ccpcluster.deploy(params={"config-file": "./config_2.yaml"})
154 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, 154 post_os_deploy_checks.check_jobs_status(k8s_actions.api,
155 namespace="ccp-second") 155 namespace="ccp-second")
156 post_os_deploy_checks.check_pods_status(k8s_actions.api, 156 post_os_deploy_checks.check_pods_status(k8s_actions.api,
157 namespace="ccp-second") 157 namespace="ccp-second")
@@ -199,7 +199,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
199 underlay.sudo_check_call("pip install python-openstackclient", 199 underlay.sudo_check_call("pip install python-openstackclient",
200 host=config.k8s.kube_host) 200 host=config.k8s.kube_host)
201 ccpcluster.deploy(params={"config-file": "./config_1.yaml"}) 201 ccpcluster.deploy(params={"config-file": "./config_1.yaml"})
202 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000) 202 post_os_deploy_checks.check_jobs_status(k8s_actions.api)
203 post_os_deploy_checks.check_pods_status(k8s_actions.api) 203 post_os_deploy_checks.check_pods_status(k8s_actions.api)
204 remote.check_call( 204 remote.check_call(
205 "source openrc-{}; openstack flavor create" 205 "source openrc-{}; openstack flavor create"
@@ -217,7 +217,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
217 '/tmp/1ctrl.yaml']) 217 '/tmp/1ctrl.yaml'])
218 218
219 ccpcluster.deploy(params={"config-file": "./config_2.yaml"}) 219 ccpcluster.deploy(params={"config-file": "./config_2.yaml"})
220 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, 220 post_os_deploy_checks.check_jobs_status(k8s_actions.api,
221 namespace="ccp-second") 221 namespace="ccp-second")
222 post_os_deploy_checks.check_pods_status(k8s_actions.api, 222 post_os_deploy_checks.check_pods_status(k8s_actions.api,
223 namespace="ccp-second") 223 namespace="ccp-second")
@@ -234,7 +234,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
234 settings.CCP_SOURCES_CONFIG, 234 settings.CCP_SOURCES_CONFIG,
235 '/tmp/1ctrl.yaml']) 235 '/tmp/1ctrl.yaml'])
236 ccpcluster.deploy(params={"config-file": "./config_3.yaml"}) 236 ccpcluster.deploy(params={"config-file": "./config_3.yaml"})
237 post_os_deploy_checks.check_jobs_status(k8s_actions.api, timeout=2000, 237 post_os_deploy_checks.check_jobs_status(k8s_actions.api,
238 namespace="ccp-third") 238 namespace="ccp-third")
239 post_os_deploy_checks.check_pods_status(k8s_actions.api, 239 post_os_deploy_checks.check_pods_status(k8s_actions.api,
240 namespace="ccp-third") 240 namespace="ccp-third")