From bf49f00d5158ee583f5eddcf395eeb1efb188cb6 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Thu, 29 Sep 2022 14:57:16 +0200 Subject: [PATCH] Fix the condition for volume revert tests They were fixed in master a few months ago, and the fix is in zed. The fix is now being backported to older branches. Also, fix the regexp used for matching. Depends-On: https://review.opendev.org/c/openstack/cinder/+/859839 Depends-On: https://review.opendev.org/c/openstack/cinder/+/859840 Depends-On: https://review.opendev.org/c/openstack/cinder/+/859841 Change-Id: I3ea117c2bf36334ba38fda90d4493276d7308db5 --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 02a8ccd..bb4f0da 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -81,7 +81,7 @@ function configure_tempest_nfs { iniset $TEMPEST_CONFIG volume-feature-enabled backup False iniset $TEMPEST_CONFIG volume-feature-enabled clone True iniset $TEMPEST_CONFIG volume-feature-enabled manage_snapshot False - if [[ "$TARGET_BRANCH" =~ master ]]; then + if [[ "$TARGET_BRANCH" =~ stable/(ocata|pike|queens|rocky|stein|train|ussuri|victoria) ]]; then iniset $TEMPEST_CONFIG volume-feature-enabled volume_revert False else iniset $TEMPEST_CONFIG volume-feature-enabled volume_revert True