summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasledzinskiy <asledzinskiy@mirantis.com>2016-12-29 12:32:03 +0200
committerasledzinskiy <asledzinskiy@mirantis.com>2016-12-29 12:32:03 +0200
commit89cde940485ead9c59450c2a0c2dce57aee7d3ce (patch)
tree81a439199193f510456a959504133d927d1bc557
parent7469806e699414e597b4471b787ca9cd7a31160b (diff)
Fix deploy-test-vms invocation
- Fix deploy-test-vms.sh invocation adding namespace option Change-Id: I093508e9f01b5f00442c87b3d2f79c6da00889d8
Notes
Notes (review): Code-Review+2: Dennis Dmitriev <ddmitriev@mirantis.com> Workflow+1: tatyana-leontovich <tleontovich@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 29 Dec 2016 11:41:10 +0000 Reviewed-on: https://review.openstack.org/415670 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/tests/system/test_ccp_containerized.py4
-rw-r--r--fuel_ccp_tests/tests/system/test_deploy.py4
-rw-r--r--fuel_ccp_tests/tests/system/test_few_os.py16
-rw-r--r--fuel_ccp_tests/tests/system/test_galera.py28
-rw-r--r--fuel_ccp_tests/tests/system/test_rabbitmq.py32
5 files changed, 42 insertions, 42 deletions
diff --git a/fuel_ccp_tests/tests/system/test_ccp_containerized.py b/fuel_ccp_tests/tests/system/test_ccp_containerized.py
index 7202bb0..4d1882e 100644
--- a/fuel_ccp_tests/tests/system/test_ccp_containerized.py
+++ b/fuel_ccp_tests/tests/system/test_ccp_containerized.py
@@ -82,7 +82,7 @@ class TestCcpContainerized(base_test.SystemBaseTest):
82 underlay.sudo_check_call("pip install python-openstackclient", 82 underlay.sudo_check_call("pip install python-openstackclient",
83 host=config.k8s.kube_host) 83 host=config.k8s.kube_host)
84 remote.check_call( 84 remote.check_call(
85 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 85 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
86 " create".format( 86 " -a create".format(
87 settings.CCP_CONF["kubernetes"]["namespace"]), 87 settings.CCP_CONF["kubernetes"]["namespace"]),
88 timeout=600) 88 timeout=600)
diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py
index 90e5b45..ebff210 100644
--- a/fuel_ccp_tests/tests/system/test_deploy.py
+++ b/fuel_ccp_tests/tests/system/test_deploy.py
@@ -58,8 +58,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
58 underlay.sudo_check_call("pip install python-openstackclient", 58 underlay.sudo_check_call("pip install python-openstackclient",
59 host=config.k8s.kube_host) 59 host=config.k8s.kube_host)
60 remote.check_call( 60 remote.check_call(
61 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 61 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
62 " create".format( 62 " -a create".format(
63 settings.CCP_CONF["kubernetes"]["namespace"]), 63 settings.CCP_CONF["kubernetes"]["namespace"]),
64 timeout=600) 64 timeout=600)
65 65
diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py
index c309b37..5e0ec76 100644
--- a/fuel_ccp_tests/tests/system/test_few_os.py
+++ b/fuel_ccp_tests/tests/system/test_few_os.py
@@ -88,8 +88,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
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")
90 remote.check_call( 90 remote.check_call(
91 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 91 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
92 " create".format( 92 " -a create".format(
93 settings.CCP_CONF["kubernetes"]["namespace"]), 93 settings.CCP_CONF["kubernetes"]["namespace"]),
94 timeout=600) 94 timeout=600)
95 95
@@ -156,8 +156,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
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")
158 remote.check_call( 158 remote.check_call(
159 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 159 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
160 " create".format( 160 " -a create".format(
161 settings.CCP_CONF["kubernetes"]["namespace"]), 161 settings.CCP_CONF["kubernetes"]["namespace"]),
162 timeout=600) 162 timeout=600)
163 163
@@ -262,8 +262,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
262 name='keystone', 262 name='keystone',
263 namespace=settings.CCP_CONF["kubernetes"]["namespace"]) 263 namespace=settings.CCP_CONF["kubernetes"]["namespace"])
264 remote.check_call( 264 remote.check_call(
265 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 265 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
266 " create".format( 266 " -a create".format(
267 settings.CCP_CONF["kubernetes"]["namespace"]), 267 settings.CCP_CONF["kubernetes"]["namespace"]),
268 timeout=600) 268 timeout=600)
269 269
@@ -286,7 +286,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
286 name='nova-api', 286 name='nova-api',
287 namespace=settings.CCP_CONF["kubernetes"]["namespace"]) 287 namespace=settings.CCP_CONF["kubernetes"]["namespace"])
288 remote.check_call( 288 remote.check_call(
289 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 289 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
290 " create".format( 290 " -a create".format(
291 settings.CCP_CONF["kubernetes"]["namespace"]), 291 settings.CCP_CONF["kubernetes"]["namespace"]),
292 timeout=600) 292 timeout=600)
diff --git a/fuel_ccp_tests/tests/system/test_galera.py b/fuel_ccp_tests/tests/system/test_galera.py
index cd0e55a..5a4954d 100644
--- a/fuel_ccp_tests/tests/system/test_galera.py
+++ b/fuel_ccp_tests/tests/system/test_galera.py
@@ -51,8 +51,8 @@ class TestGalera(base_test.SystemBaseTest):
51 remote = underlay.remote(host=config.k8s.kube_host) 51 remote = underlay.remote(host=config.k8s.kube_host)
52 show_step(4) 52 show_step(4)
53 remote.check_call( 53 remote.check_call(
54 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 54 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
55 " create".format( 55 " -a create".format(
56 settings.CCP_CONF["kubernetes"]["namespace"]), 56 settings.CCP_CONF["kubernetes"]["namespace"]),
57 timeout=600) 57 timeout=600)
58 58
@@ -82,8 +82,8 @@ class TestGalera(base_test.SystemBaseTest):
82 remote = underlay.remote(host=config.k8s.kube_host) 82 remote = underlay.remote(host=config.k8s.kube_host)
83 show_step(4) 83 show_step(4)
84 remote.check_call( 84 remote.check_call(
85 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 85 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
86 " create".format( 86 " -a create".format(
87 settings.CCP_CONF["kubernetes"]["namespace"]), 87 settings.CCP_CONF["kubernetes"]["namespace"]),
88 timeout=600) 88 timeout=600)
89 89
@@ -114,8 +114,8 @@ class TestGalera(base_test.SystemBaseTest):
114 remote = underlay.remote(host=config.k8s.kube_host) 114 remote = underlay.remote(host=config.k8s.kube_host)
115 show_step(4) 115 show_step(4)
116 remote.check_call( 116 remote.check_call(
117 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 117 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
118 " create".format( 118 " -a create".format(
119 settings.CCP_CONF["kubernetes"]["namespace"]), 119 settings.CCP_CONF["kubernetes"]["namespace"]),
120 timeout=600) 120 timeout=600)
121 121
@@ -148,8 +148,8 @@ class TestGalera(base_test.SystemBaseTest):
148 remote = underlay.remote(host=config.k8s.kube_host) 148 remote = underlay.remote(host=config.k8s.kube_host)
149 show_step(4) 149 show_step(4)
150 remote.check_call( 150 remote.check_call(
151 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 151 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
152 " create".format( 152 " -a create".format(
153 settings.CCP_CONF["kubernetes"]["namespace"]), 153 settings.CCP_CONF["kubernetes"]["namespace"]),
154 timeout=600) 154 timeout=600)
155 155
@@ -185,8 +185,8 @@ class TestGalera(base_test.SystemBaseTest):
185 remote = underlay.remote(host=config.k8s.kube_host) 185 remote = underlay.remote(host=config.k8s.kube_host)
186 show_step(4) 186 show_step(4)
187 remote.check_call( 187 remote.check_call(
188 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 188 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
189 " create".format( 189 " -a create".format(
190 settings.CCP_CONF["kubernetes"]["namespace"]), 190 settings.CCP_CONF["kubernetes"]["namespace"]),
191 timeout=600) 191 timeout=600)
192 192
@@ -234,8 +234,8 @@ class TestGalera(base_test.SystemBaseTest):
234 show_step(5) 234 show_step(5)
235 remote = underlay.remote(host=config.k8s.kube_host) 235 remote = underlay.remote(host=config.k8s.kube_host)
236 remote.check_call( 236 remote.check_call(
237 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 237 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
238 " create".format( 238 " -a create".format(
239 settings.CCP_CONF["kubernetes"]["namespace"]), 239 settings.CCP_CONF["kubernetes"]["namespace"]),
240 timeout=600) 240 timeout=600)
241 show_step(6) 241 show_step(6)
@@ -259,7 +259,7 @@ class TestGalera(base_test.SystemBaseTest):
259 "got {}".format(galera_pods)) 259 "got {}".format(galera_pods))
260 show_step(9) 260 show_step(9)
261 remote.check_call( 261 remote.check_call(
262 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 262 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
263 " create".format( 263 " -a create".format(
264 settings.CCP_CONF["kubernetes"]["namespace"]), 264 settings.CCP_CONF["kubernetes"]["namespace"]),
265 timeout=600) 265 timeout=600)
diff --git a/fuel_ccp_tests/tests/system/test_rabbitmq.py b/fuel_ccp_tests/tests/system/test_rabbitmq.py
index b54ed43..cb18d0f 100644
--- a/fuel_ccp_tests/tests/system/test_rabbitmq.py
+++ b/fuel_ccp_tests/tests/system/test_rabbitmq.py
@@ -115,8 +115,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
115 rabbit_client.delete_queue(queue) 115 rabbit_client.delete_queue(queue)
116 show_step(5) 116 show_step(5)
117 remote.check_call( 117 remote.check_call(
118 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 118 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
119 " create".format(namespace), timeout=600) 119 " -a create".format(namespace), timeout=600)
120 120
121 @pytest.mark.fail_snapshot 121 @pytest.mark.fail_snapshot
122 @pytest.mark.rabbitmq_cold_restart 122 @pytest.mark.rabbitmq_cold_restart
@@ -176,8 +176,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
176 rabbit_client.delete_queue(queue) 176 rabbit_client.delete_queue(queue)
177 show_step(5) 177 show_step(5)
178 remote.check_call( 178 remote.check_call(
179 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 179 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
180 " create".format(namespace), timeout=600) 180 " -a create".format(namespace), timeout=600)
181 181
182 @pytest.mark.fail_snapshot 182 @pytest.mark.fail_snapshot
183 @pytest.mark.rabbitmq_poweroff 183 @pytest.mark.rabbitmq_poweroff
@@ -228,8 +228,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
228 rabbit_client.delete_queue(queue) 228 rabbit_client.delete_queue(queue)
229 show_step(5) 229 show_step(5)
230 remote.check_call( 230 remote.check_call(
231 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 231 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
232 " create".format(namespace), timeout=600) 232 " -a create".format(namespace), timeout=600)
233 233
234 @pytest.mark.fail_snapshot 234 @pytest.mark.fail_snapshot
235 @pytest.mark.rabbitmq_soft_reboot 235 @pytest.mark.rabbitmq_soft_reboot
@@ -282,8 +282,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
282 rabbit_client.delete_queue(queue) 282 rabbit_client.delete_queue(queue)
283 show_step(5) 283 show_step(5)
284 remote.check_call( 284 remote.check_call(
285 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 285 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
286 " create".format(namespace), timeout=600) 286 " -a create".format(namespace), timeout=600)
287 287
288 @pytest.mark.fail_snapshot 288 @pytest.mark.fail_snapshot
289 @pytest.mark.rabbitmq_cluster_shutdown 289 @pytest.mark.rabbitmq_cluster_shutdown
@@ -343,8 +343,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
343 pod.name, namespace) 343 pod.name, namespace)
344 rabbit_client.delete_queue(queue) 344 rabbit_client.delete_queue(queue)
345 remote.check_call( 345 remote.check_call(
346 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 346 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
347 " create".format(namespace), timeout=600) 347 " -a create".format(namespace), timeout=600)
348 348
349 @pytest.mark.fail_snapshot 349 @pytest.mark.fail_snapshot
350 @pytest.mark.rabbitmq_scale_up_down 350 @pytest.mark.rabbitmq_scale_up_down
@@ -400,8 +400,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
400 400
401 show_step(5) 401 show_step(5)
402 remote.check_call( 402 remote.check_call(
403 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 403 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
404 " create".format(namespace), timeout=600) 404 " -a create".format(namespace), timeout=600)
405 show_step(6) 405 show_step(6)
406 with underlay.yaml_editor(settings.CCP_DEPLOY_TOPOLOGY, 406 with underlay.yaml_editor(settings.CCP_DEPLOY_TOPOLOGY,
407 host=config.k8s.kube_host) as editor: 407 host=config.k8s.kube_host) as editor:
@@ -419,8 +419,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
419 "Expcted to have 3 rabbit pods, got {}".format(rabbit_pods) 419 "Expcted to have 3 rabbit pods, got {}".format(rabbit_pods)
420 show_step(9) 420 show_step(9)
421 remote.check_call( 421 remote.check_call(
422 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 422 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
423 " create".format(namespace), timeout=600) 423 " -a create".format(namespace), timeout=600)
424 424
425 @pytest.mark.fail_snapshot 425 @pytest.mark.fail_snapshot
426 @pytest.mark.rabbitmq_node_replacement 426 @pytest.mark.rabbitmq_node_replacement
@@ -483,5 +483,5 @@ class TestRabbitmq(base_test.SystemBaseTest):
483 rabbit_client.delete_queue(queue) 483 rabbit_client.delete_queue(queue)
484 show_step(7) 484 show_step(7)
485 remote.check_call( 485 remote.check_call(
486 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 486 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
487 " create".format(namespace), timeout=600) 487 " -a create".format(namespace), timeout=600)