From 89cde940485ead9c59450c2a0c2dce57aee7d3ce Mon Sep 17 00:00:00 2001 From: asledzinskiy Date: Thu, 29 Dec 2016 12:32:03 +0200 Subject: [PATCH] Fix deploy-test-vms invocation - Fix deploy-test-vms.sh invocation adding namespace option Change-Id: I093508e9f01b5f00442c87b3d2f79c6da00889d8 --- .../tests/system/test_ccp_containerized.py | 4 +-- fuel_ccp_tests/tests/system/test_deploy.py | 4 +-- fuel_ccp_tests/tests/system/test_few_os.py | 16 +++++----- fuel_ccp_tests/tests/system/test_galera.py | 28 ++++++++-------- fuel_ccp_tests/tests/system/test_rabbitmq.py | 32 +++++++++---------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/fuel_ccp_tests/tests/system/test_ccp_containerized.py b/fuel_ccp_tests/tests/system/test_ccp_containerized.py index 7202bb0..4d1882e 100644 --- a/fuel_ccp_tests/tests/system/test_ccp_containerized.py +++ b/fuel_ccp_tests/tests/system/test_ccp_containerized.py @@ -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) diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py index 90e5b45..ebff210 100644 --- a/fuel_ccp_tests/tests/system/test_deploy.py +++ b/fuel_ccp_tests/tests/system/test_deploy.py @@ -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) diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py index c309b37..5e0ec76 100644 --- a/fuel_ccp_tests/tests/system/test_few_os.py +++ b/fuel_ccp_tests/tests/system/test_few_os.py @@ -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) diff --git a/fuel_ccp_tests/tests/system/test_galera.py b/fuel_ccp_tests/tests/system/test_galera.py index cd0e55a..5a4954d 100644 --- a/fuel_ccp_tests/tests/system/test_galera.py +++ b/fuel_ccp_tests/tests/system/test_galera.py @@ -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) diff --git a/fuel_ccp_tests/tests/system/test_rabbitmq.py b/fuel_ccp_tests/tests/system/test_rabbitmq.py index b54ed43..cb18d0f 100644 --- a/fuel_ccp_tests/tests/system/test_rabbitmq.py +++ b/fuel_ccp_tests/tests/system/test_rabbitmq.py @@ -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)