openstack
/
manila
Code Issues Proposed changes

Merge "[Grenade] Fix devstack configuration in CI hook" into stable/ocata

This commit is contained in:
Jenkins 2017-03-21 15:16:27 +00:00 committed by Gerrit Code Review
parent 41673af496 5db255f893
commit baf77711b5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/ci/pre_test_hook.sh
View File

@ -174,6 +174,11 @@ if [[ "$DRIVER" == "generic" ]]; then
echo -e '[[post-config|${NEUTRON_CONF:-/etc/neutron/neutron.conf}]]\n[QUOTAS]\nquota_subnet=-1\n' >> $localconf
fi
# Required for "grenade" job that uses devstack config from 'old' directory.
if [[ -d "$BASE/old/devstack" ]]; then
cp $localconf $BASE/old/devstack/local.conf
fi
# Go to Tempest dir and checkout stable commit to avoid possible
# incompatibilities for plugin stored in Manila repo.
cd $BASE/new/tempest