manila: branch aware Tempest checkout

Another take on the problem described
in 5b4dd3c, ie. Manila Tempest update
in

6b8319e32a?diff=unified#diff-e0705abec56bf0f83781d686e109d63eR63

Instead of checking out $MANILA_TEMPEST_COMMIT
blindly (ie. even if it's unset), we add a
fallback to the Tempest commit used prior to
5b4dd3c.

Change-Id: Idec3924a1b5476683e5520f83df8561d0bd0ccfd
Closes-Bug: #1524642
This commit is contained in:
Ramana Raja 2015-11-23 21:30:24 +05:30 committed by Csaba Henk
parent 28fc5d375f
commit 92c2072121
1 changed files with 3 additions and 1 deletions

View File

@ -48,7 +48,9 @@ echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path
# incompatibilities for plugin stored in Manila repo.
cd $BASE/new/tempest
source $BASE/new/manila/contrib/ci/common.sh
git checkout $MANILA_TEMPEST_COMMIT
# In lack of $MANILA_TEMPEST_COMMIT fall back to the old hardcoded
# Tempest commit.
git checkout ${MANILA_TEMPEST_COMMIT:-3b1bb9be3265f}
# Print current Tempest status
git status