From ef4db52c14497d3d0b4d16cd97ae4888b22ec5f8 Mon Sep 17 00:00:00 2001 From: yanyanhu Date: Tue, 11 Aug 2015 22:42:55 -0400 Subject: [PATCH] Fix gate job of Senlin functional test This patch tries to fix gate job of Senlin functional test. Three works were done: - Adding a judgement in plugin.sh to skip python-senlinclient installation when this is an installation happens in gate side; - Revising tox.ini to pass necessary environment variables for functional test; - Adding exetuable permission to post_test_hook.sh; Partially implement: blueprint functional-test-startpoint Change-Id: I36508910a50299afa388864704fbcbdbee609dec --- devstack/plugin.sh | 7 ++++++- senlin/tests/functional/post_test_hook.sh | 0 tox.ini | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 senlin/tests/functional/post_test_hook.sh diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 19e9ce5c9..cb505fd7c 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -12,7 +12,12 @@ if is_service_enabled sl-api sl-eng; then if [[ "$1" == "stack" && "$2" == "install" ]]; then echo_summary "Installing senlin" install_senlin - install_senlinclient + if [[ "$ERROR_ON_CLONE" == "True" ]]; then + echo_summary "This is a gate job, skip senlinclient installation" + else + echo_summary "Installing senlinclient" + install_senlinclient + fi cleanup_senlin elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then echo_summary "Configuring senlin" diff --git a/senlin/tests/functional/post_test_hook.sh b/senlin/tests/functional/post_test_hook.sh old mode 100644 new mode 100755 diff --git a/tox.ini b/tox.ini index cffe39016..4052aa328 100644 --- a/tox.ini +++ b/tox.ini @@ -20,6 +20,7 @@ commands = whitelist_externals = bash [testenv:functional] +passenv = OS_USERNAME OS_PASSWORD OS_TENANT_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME OS_REGION_NAME OS_AUTH_URL commands = ostestr --slowest --concurrency 1 --regex '^(.*?tests\.functional)' {posargs}