From b44d14de148a0203b5b02380ffdaacf4a379cfbe Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 12 Aug 2015 05:53:59 +0000 Subject: [PATCH] Revert "Cleanup unneeded bug workarounds" This reverts commit 08daf5dc1413b12871cf6adda9fa3a36aab35deb. The change effectively enabled the new driver for all neutron jobs, including those that run advanced services API tests, which are not yet ready for it. Original plan was to try a revert of a patch in fwaas (I1777a3e6dc011524295edfcd9dbc037a8293f868) but then it was dropped from the gate. Anyway, testing revealed it's not going to fix the issue. Since we should not leave neutron branches broken for indefinite time, I propose this revert that should get us back to stable neutron gate. Without the issue solved, critical efforts like QoS feature branch merge-back into master are effectively blocked. Also, each neutron patch pushed into gate has a very high chance to break and reset the queue, which affects other projects. Related-Bug: #1483875 Change-Id: I45c7fb10c62e3440ca797497a81097ff0ecf90c3 --- devstack-vm-gate.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 8515c426..a071601b 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -212,6 +212,11 @@ function setup_localrc { if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then echo "Q_USE_DEBUG_COMMAND=True" >>"$localrc_file" echo "NETWORK_GATEWAY=10.1.0.1" >>"$localrc_file" + # TODO(armax): get rid of this if as soon as bugs #1464612 and #1432189 get resolved + if [[ "$DEVSTACK_GATE_NEUTRON_UNSTABLE" -eq "0" ]]; then + echo "MYSQL_DRIVER=MySQL-python" >>"$localrc_file" + echo "API_WORKERS=0" >>"$localrc_file" + fi fi if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then