summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasledzinskiy <asledzinskiy@mirantis.com>2016-11-28 18:32:31 +0200
committerasledzinskiy <asledzinskiy@mirantis.com>2016-11-28 18:32:31 +0200
commit7f559a258f1b58cfad14a24ad927d3679ed1166d (patch)
tree04684b54d009fdff1eeb5ce504a597ab8e94d7ee
parent27e62c6f13fb0e9f204f6832fa3641bac5c0635e (diff)
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
Notes
Notes (review): Code-Review+1: Artem Panchenko <apanchenko@mirantis.com> Code-Review+2: tatyana-leontovich <tleontovich@mirantis.com> Workflow+1: tatyana-leontovich <tleontovich@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Mon, 28 Nov 2016 16:51:23 +0000 Reviewed-on: https://review.openstack.org/403795 Project: openstack/fuel-ccp-tests Branch: refs/heads/master
-rw-r--r--fuel_ccp_tests/tests/system/test_deploy.py5
-rw-r--r--fuel_ccp_tests/tests/system/test_few_os.py30
2 files changed, 14 insertions, 21 deletions
diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py
index 7c9f8db..ec6b023 100644
--- a/fuel_ccp_tests/tests/system/test_deploy.py
+++ b/fuel_ccp_tests/tests/system/test_deploy.py
@@ -65,9 +65,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
65 host=config.k8s.kube_host) 65 host=config.k8s.kube_host)
66 remote.check_call( 66 remote.check_call(
67 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 67 "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
68 " create -i {1}".format( 68 " create".format(
69 settings.CCP_CONF["kubernetes"]["namespace"], 69 settings.CCP_CONF["kubernetes"]["namespace"]),
70 settings.IFACES['public']),
71 timeout=600) 70 timeout=600)
72 71
73 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) 72 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py
index 91cd637..7c86578 100644
--- a/fuel_ccp_tests/tests/system/test_few_os.py
+++ b/fuel_ccp_tests/tests/system/test_few_os.py
@@ -68,9 +68,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
68 post_os_deploy_checks.check_pods_status(k8s_actions.api) 68 post_os_deploy_checks.check_pods_status(k8s_actions.api)
69 remote.check_call( 69 remote.check_call(
70 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 70 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
71 " create -i {1}".format( 71 " create".format(
72 settings.CCP_CONF["kubernetes"]["namespace"], 72 settings.CCP_CONF["kubernetes"]["namespace"]),
73 settings.IFACES['public']),
74 timeout=600) 73 timeout=600)
75 74
76 topology_path = \ 75 topology_path = \
@@ -92,9 +91,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
92 namespace="ccp-second") 91 namespace="ccp-second")
93 remote.check_call( 92 remote.check_call(
94 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 93 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
95 " create -i {1}".format( 94 " create".format(
96 settings.CCP_CONF["kubernetes"]["namespace"], 95 settings.CCP_CONF["kubernetes"]["namespace"]),
97 settings.IFACES['public']),
98 timeout=600) 96 timeout=600)
99 97
100 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) 98 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
@@ -139,9 +137,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
139 post_os_deploy_checks.check_pods_status(k8s_actions.api) 137 post_os_deploy_checks.check_pods_status(k8s_actions.api)
140 remote.check_call( 138 remote.check_call(
141 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 139 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
142 " create -i {1}".format( 140 " create".format(
143 settings.CCP_CONF["kubernetes"]["namespace"], 141 settings.CCP_CONF["kubernetes"]["namespace"]),
144 settings.IFACES['public']),
145 timeout=600) 142 timeout=600)
146 143
147 topology_path = \ 144 topology_path = \
@@ -163,9 +160,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
163 namespace="ccp-second") 160 namespace="ccp-second")
164 remote.check_call( 161 remote.check_call(
165 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 162 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
166 " create -i {1}".format( 163 " create".format(
167 settings.CCP_CONF["kubernetes"]["namespace"], 164 settings.CCP_CONF["kubernetes"]["namespace"]),
168 settings.IFACES['public']),
169 timeout=600) 165 timeout=600)
170 166
171 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) 167 @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
@@ -271,9 +267,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
271 namespace=settings.CCP_CONF["kubernetes"]["namespace"]) 267 namespace=settings.CCP_CONF["kubernetes"]["namespace"])
272 remote.check_call( 268 remote.check_call(
273 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 269 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
274 " create -i {1}".format( 270 " create".format(
275 settings.CCP_CONF["kubernetes"]["namespace"], 271 settings.CCP_CONF["kubernetes"]["namespace"]),
276 settings.IFACES['public']),
277 timeout=600) 272 timeout=600)
278 273
279 @pytest.mark.revert_snapshot(name="two_os") 274 @pytest.mark.revert_snapshot(name="two_os")
@@ -296,7 +291,6 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
296 namespace=settings.CCP_CONF["kubernetes"]["namespace"]) 291 namespace=settings.CCP_CONF["kubernetes"]["namespace"])
297 remote.check_call( 292 remote.check_call(
298 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" 293 "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
299 " create -i {1}".format( 294 " create".format(
300 settings.CCP_CONF["kubernetes"]["namespace"], 295 settings.CCP_CONF["kubernetes"]["namespace"]),
301 settings.IFACES['public']),
302 timeout=600) 296 timeout=600)