openstack
/
heat
Code Issues Proposed changes

Merge "Allow users to disable the tests run by Grenade"

This commit is contained in:
Zuul 2019-03-08 23:52:02 +00:00 committed by Gerrit Code Review
parent e7c2cbe340 2b580f4258
commit 31b19b2139
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/upgrade/resources.sh
View File

@ -73,8 +73,10 @@ function _run_heat_integrationtests {
}
function create {
# run heat integration tests instead of tempest smoke before create
_run_heat_integrationtests $BASE_DEVSTACK_DIR
if [ "${RUN_HEAT_INTEGRATION_TESTS}" == "True" ]; then
# run heat integration tests instead of tempest smoke before create
_run_heat_integrationtests $BASE_DEVSTACK_DIR
fi
source $TOP_DIR/openrc admin admin
# creates a tenant for the server
@ -110,7 +112,9 @@ function verify {
_heat_set_user
local side="$1"
if [[ "$side" = "post-upgrade" ]]; then
_run_heat_integrationtests $TARGET_DEVSTACK_DIR
if [ "${RUN_HEAT_INTEGRATION_TESTS}" == "True" ]; then
_run_heat_integrationtests $TARGET_DEVSTACK_DIR
fi
fi
stack_name=$(resource_get heat stack_name)
heat stack-show $stack_name

3
devstack/upgrade/settings
View File

@ -4,5 +4,8 @@ devstack_localrc base enable_service h-api h-api-cfn h-eng heat tempest
devstack_localrc target enable_service h-api h-api-cfn h-eng heat tempest
BASE_RUN_SMOKE=False
TARGET_RUN_SMOKE=False
# Integration tests may be skipped when heat is not the main
# focus of the testing.
export RUN_HEAT_INTEGRATION_TESTS=$(trueorfalse True RUN_HEAT_INTEGRATION_TESTS)
export HOST_TOPOLOGY=${HOST_TOPOLOGY}