From 5db255f89381277cdc9c4dc52f099bc6da30a971 Mon Sep 17 00:00:00 2001 From: Valeriy Ponomaryov Date: Mon, 27 Feb 2017 18:15:20 +0200 Subject: [PATCH] [Grenade] Fix devstack configuration in CI hook Commit [1] fixed approach for setting devstack config according to changes [2] in devstack. But it started updating only 1 of 2 possible devstack directories that are 'old' and 'new'. Where 'old' is the one that is used only in 'grenade' job as base installation for performing project migration. 'new' is used in all other single-devstack installations. So, with [1] everything started working except 'grenade' job. Fix grenade job by copying devstack config to 'old' dir if it exists. [1] Idfa8e0cb3f446361daa1449e0854d95cfb379f46 [2] http://lists.openstack.org/pipermail/openstack-dev/2017-February/112872.html Change-Id: Ic00a1fe296fa68a65672fa680ebd8a9336ed7cef (cherry picked from commit 0b3fce7a04e79afd7bbf623baa380677ee5ba2e7) --- contrib/ci/pre_test_hook.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index e17ef11b1a..ba5f0423cb 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -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