diff options
| author | Sirushti Murugesan <sirushti.murugesan@hp.com> | 2015-08-06 16:56:09 +0530 |
|---|---|---|
| committer | Sirushti Murugesan <sirushti.murugesan@hp.com> | 2015-10-06 06:58:07 +0000 |
| commit | ba4a7026c7c5e9558770354c6d58d2f60ff46e75 (patch) | |
| tree | 353a312971d336e7b0e28a706d56e0a3f852a12f /devstack/upgrade | |
| parent | b14bee0635883031d1a0714be4f8e0f600c35c69 (diff) | |
| download | heat-ba4a7026c7c5e9558770354c6d58d2f60ff46e75.tar.gz | |
Grenade: Run select heat_integrationtests instead of tempest smoke
Only a few tests are run because these tests only verify the
sanity of the build rather than doing the upgrade tests itself.
Closes-Bug: #1482152
partial blueprint upgrade-tests
Change-Id: I8fed19bd25cc3a62c03c35afafe2b662551dbd4e
Diffstat (limited to 'devstack/upgrade')
| -rwxr-xr-x | devstack/upgrade/resources.sh | 5 | ||||
| -rw-r--r-- | devstack/upgrade/settings | 2 | ||||
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index 2a0d1bf95..6f95f4544 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -32,6 +32,11 @@ function _heat_set_user { } function create { + # run heat_integrationtests instead of tempest smoke before create + pushd $BASE_DEVSTACK_DIR/../heat + tox -eintegration heat_integrationtests.functional.test_create_update + popd + # creates a tenant for the server eval $(openstack project create -f shell -c id $HEAT_PROJECT) if [[ -z "$id" ]]; then diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 9d05220e1..3cd057e99 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -2,3 +2,5 @@ register_project_for_upgrade heat register_db_to_save heat devstack_localrc base enable_service h-api h-api-cfn h-api-cw h-eng heat tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification devstack_localrc target enable_service h-api h-api-cfn h-api-cw h-eng heat tempest ceilometer-alarm-evaluator ceilometer-alarm-notifier ceilometer-anotification +BASE_RUN_SMOKE=False +TARGET_RUN_SMOKE=False diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 527512bde..9274141b9 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -82,6 +82,12 @@ start_heat # Don't succeed unless the services come up ensure_services_started heat-api heat-engine heat-api-cloudwatch heat-api-cfn +# run heat_integrationtests instead of tempest smoke after upgrade +pushd $TARGET_DEVSTACK_DIR/../heat +source $TARGET_DEVSTACK_DIR/openrc demo demo +tox -eintegration heat_integrationtests.functional.test_create_update +popd + set +o xtrace echo "*********************************************************************" echo "SUCCESS: End $0" |