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
This commit is contained in:
parent
27e62c6f13
commit
7f559a258f
|
@ -65,9 +65,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest):
|
|||
host=config.k8s.kube_host)
|
||||
remote.check_call(
|
||||
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
@pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
|
||||
|
|
|
@ -68,9 +68,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
post_os_deploy_checks.check_pods_status(k8s_actions.api)
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
topology_path = \
|
||||
|
@ -92,9 +91,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
namespace="ccp-second")
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
@pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
|
||||
|
@ -139,9 +137,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
post_os_deploy_checks.check_pods_status(k8s_actions.api)
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
topology_path = \
|
||||
|
@ -163,9 +160,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
namespace="ccp-second")
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
@pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed)
|
||||
|
@ -271,9 +267,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
namespace=settings.CCP_CONF["kubernetes"]["namespace"])
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
||||
@pytest.mark.revert_snapshot(name="two_os")
|
||||
|
@ -296,7 +291,6 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
|
|||
namespace=settings.CCP_CONF["kubernetes"]["namespace"])
|
||||
remote.check_call(
|
||||
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
|
||||
" create -i {1}".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"],
|
||||
settings.IFACES['public']),
|
||||
" create".format(
|
||||
settings.CCP_CONF["kubernetes"]["namespace"]),
|
||||
timeout=600)
|
||||
|
|
Loading…
Reference in New Issue