Browse Source

Fix parameters passed to deploy-test-vms.sh

- Neutron fixed network creation was moved to k8s jobs
thus this part was deleted from deploy-test-vms.sh and
there is no need to pass it to script

Change-Id: I347de611e505859b0b9223fb87f96af35c67043b
asledzinskiy 2 years ago
parent
commit
7f559a258f

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

@@ -65,9 +65,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
65 65
                                  host=config.k8s.kube_host)
66 66
         remote.check_call(
67 67
             "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
68
-            " create -i {1}".format(
69
-                settings.CCP_CONF["kubernetes"]["namespace"],
70
-                settings.IFACES['public']),
68
+            " create".format(
69
+                settings.CCP_CONF["kubernetes"]["namespace"]),
71 70
             timeout=600)
72 71
 
73 72
     @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)

+ 12
- 18
fuel_ccp_tests/tests/system/test_few_os.py View File

@@ -68,9 +68,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
68 68
         post_os_deploy_checks.check_pods_status(k8s_actions.api)
69 69
         remote.check_call(
70 70
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
71
-            " create -i {1}".format(
72
-                settings.CCP_CONF["kubernetes"]["namespace"],
73
-                settings.IFACES['public']),
71
+            " create".format(
72
+                settings.CCP_CONF["kubernetes"]["namespace"]),
74 73
             timeout=600)
75 74
 
76 75
         topology_path = \
@@ -92,9 +91,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
92 91
                                                 namespace="ccp-second")
93 92
         remote.check_call(
94 93
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
95
-            " create -i {1}".format(
96
-                settings.CCP_CONF["kubernetes"]["namespace"],
97
-                settings.IFACES['public']),
94
+            " create".format(
95
+                settings.CCP_CONF["kubernetes"]["namespace"]),
98 96
             timeout=600)
99 97
 
100 98
     @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
@@ -139,9 +137,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
139 137
         post_os_deploy_checks.check_pods_status(k8s_actions.api)
140 138
         remote.check_call(
141 139
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
142
-            " create -i {1}".format(
143
-                settings.CCP_CONF["kubernetes"]["namespace"],
144
-                settings.IFACES['public']),
140
+            " create".format(
141
+                settings.CCP_CONF["kubernetes"]["namespace"]),
145 142
             timeout=600)
146 143
 
147 144
         topology_path = \
@@ -163,9 +160,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
163 160
                                                 namespace="ccp-second")
164 161
         remote.check_call(
165 162
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
166
-            " create -i {1}".format(
167
-                settings.CCP_CONF["kubernetes"]["namespace"],
168
-                settings.IFACES['public']),
163
+            " create".format(
164
+                settings.CCP_CONF["kubernetes"]["namespace"]),
169 165
             timeout=600)
170 166
 
171 167
     @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
@@ -271,9 +267,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
271 267
             namespace=settings.CCP_CONF["kubernetes"]["namespace"])
272 268
         remote.check_call(
273 269
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
274
-            " create -i {1}".format(
275
-                settings.CCP_CONF["kubernetes"]["namespace"],
276
-                settings.IFACES['public']),
270
+            " create".format(
271
+                settings.CCP_CONF["kubernetes"]["namespace"]),
277 272
             timeout=600)
278 273
 
279 274
     @pytest.mark.revert_snapshot(name="two_os")
@@ -296,7 +291,6 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
296 291
             namespace=settings.CCP_CONF["kubernetes"]["namespace"])
297 292
         remote.check_call(
298 293
             "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
299
-            " create -i {1}".format(
300
-                settings.CCP_CONF["kubernetes"]["namespace"],
301
-                settings.IFACES['public']),
294
+            " create".format(
295
+                settings.CCP_CONF["kubernetes"]["namespace"]),
302 296
             timeout=600)

Loading…
Cancel
Save