Browse Source

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
Ramana Raja 3 years ago
parent
commit
92c2072121
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      manila/pre_test_hook.sh

+ 3
- 1
manila/pre_test_hook.sh View File

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

Loading…
Cancel
Save