Fix deploy-test-vms invocation

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

Change-Id: I093508e9f01b5f00442c87b3d2f79c6da00889d8
This commit is contained in:
asledzinskiy 2016-12-29 12:32:03 +02:00
parent 7469806e69
commit 89cde94048
5 changed files with 42 additions and 42 deletions

View File

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

View File

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

View File

@ -88,8 +88,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
post_os_deploy_checks.check_pods_status(k8s_actions.api,
namespace="ccp-second")
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -156,8 +156,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
post_os_deploy_checks.check_pods_status(k8s_actions.api,
namespace="ccp-second")
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -262,8 +262,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
name='keystone',
namespace=settings.CCP_CONF["kubernetes"]["namespace"])
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -286,7 +286,7 @@ class TestDeployTwoOS(base_test.SystemBaseTest):
name='nova-api',
namespace=settings.CCP_CONF["kubernetes"]["namespace"])
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)

View File

@ -51,8 +51,8 @@ class TestGalera(base_test.SystemBaseTest):
remote = underlay.remote(host=config.k8s.kube_host)
show_step(4)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -82,8 +82,8 @@ class TestGalera(base_test.SystemBaseTest):
remote = underlay.remote(host=config.k8s.kube_host)
show_step(4)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -114,8 +114,8 @@ class TestGalera(base_test.SystemBaseTest):
remote = underlay.remote(host=config.k8s.kube_host)
show_step(4)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -148,8 +148,8 @@ class TestGalera(base_test.SystemBaseTest):
remote = underlay.remote(host=config.k8s.kube_host)
show_step(4)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -185,8 +185,8 @@ class TestGalera(base_test.SystemBaseTest):
remote = underlay.remote(host=config.k8s.kube_host)
show_step(4)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
@ -234,8 +234,8 @@ class TestGalera(base_test.SystemBaseTest):
show_step(5)
remote = underlay.remote(host=config.k8s.kube_host)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)
show_step(6)
@ -259,7 +259,7 @@ class TestGalera(base_test.SystemBaseTest):
"got {}".format(galera_pods))
show_step(9)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(
settings.CCP_CONF["kubernetes"]["namespace"]),
timeout=600)

View File

@ -115,8 +115,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
rabbit_client.delete_queue(queue)
show_step(5)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_cold_restart
@ -176,8 +176,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
rabbit_client.delete_queue(queue)
show_step(5)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_poweroff
@ -228,8 +228,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
rabbit_client.delete_queue(queue)
show_step(5)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_soft_reboot
@ -282,8 +282,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
rabbit_client.delete_queue(queue)
show_step(5)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_cluster_shutdown
@ -343,8 +343,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
pod.name, namespace)
rabbit_client.delete_queue(queue)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_scale_up_down
@ -400,8 +400,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
show_step(5)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
show_step(6)
with underlay.yaml_editor(settings.CCP_DEPLOY_TOPOLOGY,
host=config.k8s.kube_host) as editor:
@ -419,8 +419,8 @@ class TestRabbitmq(base_test.SystemBaseTest):
"Expcted to have 3 rabbit pods, got {}".format(rabbit_pods)
show_step(9)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)
@pytest.mark.fail_snapshot
@pytest.mark.rabbitmq_node_replacement
@ -483,5 +483,5 @@ class TestRabbitmq(base_test.SystemBaseTest):
rabbit_client.delete_queue(queue)
show_step(7)
remote.check_call(
"source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a"
" create".format(namespace), timeout=600)
"source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -k {0}"
" -a create".format(namespace), timeout=600)