From e96e7cb299ee5d057f86f5e68b26ecc2d425c938 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Tue, 7 Jun 2016 15:53:00 +0300 Subject: [PATCH] [Tempest] HotFix for broken CI jobs Recently merged commit to "neutron-fwaas" project [1] started using one of Tempest's modules that appeared after version our plugin uses. So, implement hotfix-workaround until we make all compatibility changes to latest Tempest in our plugin. For the moment, we cannot switch to latest Tempest as we already have incompatibility for it, see bug [2]. [1] https://review.openstack.org/#/c/326150/ [2] https://bugs.launchpad.net/manila/+bug/1586129 Change-Id: I44655c83cc5588c5b94d0fad81162dd0c238b5b4 Closes-Bug: #1589964 --- contrib/ci/pre_test_hook.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 96a490a977..6766384f3b 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -92,6 +92,9 @@ echo "MANILA_SERVICE_IMAGE_ENABLED=$MANILA_SERVICE_IMAGE_ENABLED" >> $localrc_pa # created vm's in scenario tests. echo 'ENABLE_ISOLATED_METADATA=True' >> $localrc_path +# Workaround for broken CI, see bug #1589964. +cd $BASE/new/neutron-fwaas +git revert --no-edit a59df892d3f90f97c967a46b6c18e595d60a9b85 # Go to Tempest dir and checkout stable commit to avoid possible # incompatibilities for plugin stored in Manila repo.