From fbb6ddc7f74c6e5d13405696be138336f40b95f7 Mon Sep 17 00:00:00 2001 From: Ramana Raja Date: Wed, 23 Dec 2015 20:53:37 +0530 Subject: [PATCH] Use appropriate Tempest per Manila branch Fix CI failure by selecting Tempest version based on Manila branch. Co-Authored-By: Valeriy Ponomaryov Closes Bug: #1513105 Change-Id: I4e9b9699ac679511bb4174ffa8c880b8489695f4 --- manila/pre_test_hook.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manila/pre_test_hook.sh b/manila/pre_test_hook.sh index 880eebe..7979f03 100755 --- a/manila/pre_test_hook.sh +++ b/manila/pre_test_hook.sh @@ -29,10 +29,13 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path # Go to Tempest dir and checkout stable commit to avoid possible # incompatibilities for plugin stored in Manila repo. -TEMPEST_COMMIT="3b1bb9be3265f" # 28 Aug, 2015 - cd $BASE/new/tempest -git checkout $TEMPEST_COMMIT +TEMPEST_COMMIT="3b1bb9be3265f" # 28 Aug, 2015 - for stable/liberty only +if [[ -f $BASE/new/manila/contrib/ci/common.sh ]]; then + # M+ branch + source $BASE/new/manila/contrib/ci/common.sh +fi +git checkout ${MANILA_TEMPEST_COMMIT:-$TEMPEST_COMMIT} # Print current Tempest status git status