summaryrefslogtreecommitdiff
path: root/devstack/upgrade
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-02 10:16:30 +0000
committerGerrit Code Review <review@openstack.org>2016-09-02 10:16:30 +0000
commit11d747b4c9958efbe0bc634f5a0fe959e9a6e2cc (patch)
tree48222d68ef744119f1a6dd08f4abf1b5dc6b3bdb /devstack/upgrade
parentba86557ed2b2426fa82659d3fa7a3cc9a9d51d2e (diff)
parent7afb32bdd6f99b9fc4890e2865d662b19d60aaa1 (diff)
downloadheat-11d747b4c9958efbe0bc634f5a0fe959e9a6e2cc.tar.gz
Merge "Don't run neutron tests before upgrade"
Diffstat (limited to 'devstack/upgrade')
-rwxr-xr-xdevstack/upgrade/resources.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh
index ff28ccd88..cbfe97fd2 100755
--- a/devstack/upgrade/resources.sh
+++ b/devstack/upgrade/resources.sh
@@ -45,7 +45,7 @@ function create {
iniset $conf_file heat_plugin user_domain_name $OS_USER_DOMAIN_NAME
iniset $conf_file heat_plugin project_domain_name $OS_PROJECT_DOMAIN_NAME
iniset $conf_file heat_plugin region $OS_REGION_NAME
- tox -eintegration heat_integrationtests.functional.test_create_update
+ tox -eintegration -- '(test_create_update.CreateStackTest|test_create_update.UpdateStackTest)'
popd
# creates a tenant for the server