openstack/devstack-plugin-ceph
Code Issues Proposed changes

tempest: re-enable shelve tests for train

Browse Source 
The dependent nova fix resolves the issue with rbd and
shelve/unshelve testing in tempest. Re-enabling the test
needs to be branch-specific since devstack-plugin-ceph
is branch-less but the fixes in nova will be branch
specific so we don't want to enable this on any nova
branch that does not have the fix since it would break
the job on those branches.

Related-Bug: #1653953

Depends-On: https://review.opendev.org/457886/

Co-Authored-By: Matt Riedemann <mriedem.os@gmail.com>

Change-Id: Ifbfc15033020c430a93574f2726b2279c9be130d
This commit is contained in:
Lee Yarwood
2019-05-30 21:23:10 +01:00
committed by Matt Riedemann
parent ff1b423178
commit fdb1efbe0a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/plugin.sh
View File

@@ -97,12 +97,13 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
if is_service_enabled tempest; then if is_service_enabled tempest; then
iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume False iniset $TEMPEST_CONFIG compute-feature-enabled swap_volume False
# This is only being set because the tempest test # Only enable shelve testing for branches which have the fix for
# test_shelve_unshelve_server fails with an # nova bug 1653953.
# "After unshelve, shelved image is not deleted" if [[ "$TARGET_BRANCH" =~ stable/(ocata|pike|queens|rocky|stein) ]]; then
# failure. Re-enable this feature when that test is fixed.
# https://review.openstack.org/#/c/471352/
iniset $TEMPEST_CONFIG compute-feature-enabled shelve False iniset $TEMPEST_CONFIG compute-feature-enabled shelve False
else
iniset $TEMPEST_CONFIG compute-feature-enabled shelve True
fi
fi fi
fi fi