Browse Source

Fix deploy-test-vms invocation

- Fix deploy-test-vms.sh invocation adding namespace option

Change-Id: I093508e9f01b5f00442c87b3d2f79c6da00889d8
asledzinskiy 2 years ago
parent
commit
89cde94048

+ 2
- 2
fuel_ccp_tests/tests/system/test_ccp_containerized.py View File

@@ -82,7 +82,7 @@ class TestCcpContainerized(base_test.SystemBaseTest):
82 82
         underlay.sudo_check_call("pip install python-openstackclient",
83 83
                                  host=config.k8s.kube_host)
84 84
         remote.check_call(
85
-            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
86
-            " create".format(
85
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
86
+            " -a create".format(
87 87
                 settings.CCP_CONF["kubernetes"]["namespace"]),
88 88
             timeout=600)

+ 2
- 2
fuel_ccp_tests/tests/system/test_deploy.py View File

@@ -58,8 +58,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
58 58
         underlay.sudo_check_call("pip install python-openstackclient",
59 59
                                  host=config.k8s.kube_host)
60 60
         remote.check_call(
61
-            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
62
-            " create".format(
61
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
62
+            " -a create".format(
63 63
                 settings.CCP_CONF["kubernetes"]["namespace"]),
64 64
             timeout=600)
65 65
 

+ 8
- 8
fuel_ccp_tests/tests/system/test_few_os.py View File

@@ -88,8 +88,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
88 88
         post_os_deploy_checks.check_pods_status(k8s_actions.api,
89 89
                                                 namespace="ccp-second")
90 90
         remote.check_call(
91
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
92
-            " create".format(
91
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
92
+            " -a create".format(
93 93
                 settings.CCP_CONF["kubernetes"]["namespace"]),
94 94
             timeout=600)
95 95
 
@@ -156,8 +156,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
156 156
         post_os_deploy_checks.check_pods_status(k8s_actions.api,
157 157
                                                 namespace="ccp-second")
158 158
         remote.check_call(
159
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
160
-            " create".format(
159
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
160
+            " -a create".format(
161 161
                 settings.CCP_CONF["kubernetes"]["namespace"]),
162 162
             timeout=600)
163 163
 
@@ -262,8 +262,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
262 262
             name='keystone',
263 263
             namespace=settings.CCP_CONF["kubernetes"]["namespace"])
264 264
         remote.check_call(
265
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
266
-            " create".format(
265
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
266
+            " -a create".format(
267 267
                 settings.CCP_CONF["kubernetes"]["namespace"]),
268 268
             timeout=600)
269 269
 
@@ -286,7 +286,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
286 286
             name='nova-api',
287 287
             namespace=settings.CCP_CONF["kubernetes"]["namespace"])
288 288
         remote.check_call(
289
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
290
-            " create".format(
289
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
290
+            " -a create".format(
291 291
                 settings.CCP_CONF["kubernetes"]["namespace"]),
292 292
             timeout=600)

+ 14
- 14
fuel_ccp_tests/tests/system/test_galera.py View File

@@ -51,8 +51,8 @@ class TestGalera(base_test.SystemBaseTest):
51 51
         remote = underlay.remote(host=config.k8s.kube_host)
52 52
         show_step(4)
53 53
         remote.check_call(
54
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
55
-            " create".format(
54
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
55
+            " -a create".format(
56 56
                 settings.CCP_CONF["kubernetes"]["namespace"]),
57 57
             timeout=600)
58 58
 
@@ -82,8 +82,8 @@ class TestGalera(base_test.SystemBaseTest):
82 82
         remote = underlay.remote(host=config.k8s.kube_host)
83 83
         show_step(4)
84 84
         remote.check_call(
85
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
86
-            " create".format(
85
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
86
+            " -a create".format(
87 87
                 settings.CCP_CONF["kubernetes"]["namespace"]),
88 88
             timeout=600)
89 89
 
@@ -114,8 +114,8 @@ class TestGalera(base_test.SystemBaseTest):
114 114
         remote = underlay.remote(host=config.k8s.kube_host)
115 115
         show_step(4)
116 116
         remote.check_call(
117
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
118
-            " create".format(
117
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
118
+            " -a create".format(
119 119
                 settings.CCP_CONF["kubernetes"]["namespace"]),
120 120
             timeout=600)
121 121
 
@@ -148,8 +148,8 @@ class TestGalera(base_test.SystemBaseTest):
148 148
         remote = underlay.remote(host=config.k8s.kube_host)
149 149
         show_step(4)
150 150
         remote.check_call(
151
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
152
-            " create".format(
151
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
152
+            " -a create".format(
153 153
                 settings.CCP_CONF["kubernetes"]["namespace"]),
154 154
             timeout=600)
155 155
 
@@ -185,8 +185,8 @@ class TestGalera(base_test.SystemBaseTest):
185 185
         remote = underlay.remote(host=config.k8s.kube_host)
186 186
         show_step(4)
187 187
         remote.check_call(
188
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
189
-            " create".format(
188
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
189
+            " -a create".format(
190 190
                 settings.CCP_CONF["kubernetes"]["namespace"]),
191 191
             timeout=600)
192 192
 
@@ -234,8 +234,8 @@ class TestGalera(base_test.SystemBaseTest):
234 234
         show_step(5)
235 235
         remote = underlay.remote(host=config.k8s.kube_host)
236 236
         remote.check_call(
237
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
238
-            " create".format(
237
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
238
+            " -a create".format(
239 239
                 settings.CCP_CONF["kubernetes"]["namespace"]),
240 240
             timeout=600)
241 241
         show_step(6)
@@ -259,7 +259,7 @@ class TestGalera(base_test.SystemBaseTest):
259 259
                                   "got {}".format(galera_pods))
260 260
         show_step(9)
261 261
         remote.check_call(
262
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
263
-            " create".format(
262
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
263
+            " -a create".format(
264 264
                 settings.CCP_CONF["kubernetes"]["namespace"]),
265 265
             timeout=600)

+ 16
- 16
fuel_ccp_tests/tests/system/test_rabbitmq.py View File

@@ -115,8 +115,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
115 115
         rabbit_client.delete_queue(queue)
116 116
         show_step(5)
117 117
         remote.check_call(
118
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
119
-            " create".format(namespace), timeout=600)
118
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
119
+            " -a create".format(namespace), timeout=600)
120 120
 
121 121
     @pytest.mark.fail_snapshot
122 122
     @pytest.mark.rabbitmq_cold_restart
@@ -176,8 +176,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
176 176
         rabbit_client.delete_queue(queue)
177 177
         show_step(5)
178 178
         remote.check_call(
179
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
180
-            " create".format(namespace), timeout=600)
179
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
180
+            " -a create".format(namespace), timeout=600)
181 181
 
182 182
     @pytest.mark.fail_snapshot
183 183
     @pytest.mark.rabbitmq_poweroff
@@ -228,8 +228,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
228 228
         rabbit_client.delete_queue(queue)
229 229
         show_step(5)
230 230
         remote.check_call(
231
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
232
-            " create".format(namespace), timeout=600)
231
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
232
+            " -a create".format(namespace), timeout=600)
233 233
 
234 234
     @pytest.mark.fail_snapshot
235 235
     @pytest.mark.rabbitmq_soft_reboot
@@ -282,8 +282,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
282 282
         rabbit_client.delete_queue(queue)
283 283
         show_step(5)
284 284
         remote.check_call(
285
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
286
-            " create".format(namespace), timeout=600)
285
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
286
+            " -a create".format(namespace), timeout=600)
287 287
 
288 288
     @pytest.mark.fail_snapshot
289 289
     @pytest.mark.rabbitmq_cluster_shutdown
@@ -343,8 +343,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
343 343
                                                  pod.name, namespace)
344 344
         rabbit_client.delete_queue(queue)
345 345
         remote.check_call(
346
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
347
-            " create".format(namespace), timeout=600)
346
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
347
+            " -a create".format(namespace), timeout=600)
348 348
 
349 349
     @pytest.mark.fail_snapshot
350 350
     @pytest.mark.rabbitmq_scale_up_down
@@ -400,8 +400,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
400 400
 
401 401
         show_step(5)
402 402
         remote.check_call(
403
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
404
-            " create".format(namespace), timeout=600)
403
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
404
+            " -a create".format(namespace), timeout=600)
405 405
         show_step(6)
406 406
         with underlay.yaml_editor(settings.CCP_DEPLOY_TOPOLOGY,
407 407
                                   host=config.k8s.kube_host) as editor:
@@ -419,8 +419,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
419 419
             "Expcted to have 3 rabbit pods, got {}".format(rabbit_pods)
420 420
         show_step(9)
421 421
         remote.check_call(
422
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
423
-            " create".format(namespace), timeout=600)
422
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
423
+            " -a create".format(namespace), timeout=600)
424 424
 
425 425
     @pytest.mark.fail_snapshot
426 426
     @pytest.mark.rabbitmq_node_replacement
@@ -483,5 +483,5 @@ class TestRabbitmq(base_test.SystemBaseTest):
483 483
         rabbit_client.delete_queue(queue)
484 484
         show_step(7)
485 485
         remote.check_call(
486
-            "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
487
-            " create".format(namespace), timeout=600)
486
+            "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
487
+            " -a create".format(namespace), timeout=600)

Loading…
Cancel
Save