openstack
/
tripleo-ci
Code Issues Proposed changes

temprevert neutron "Don't create HA resources until needed" patch 

https://bugs.launchpad.net/tripleo/+bug/1654032/

Reverting a Neutron patch until it's fixed upstream.
Note: do not revert when the job run in Neutron's gate.

Change-Id: Ic3ea505e877608bc9d9c529b698a5068a67461a4
This commit is contained in:
Emilien Macchi 2017-01-05 08:38:56 -05:00
parent 92207840df
commit 86c8c7626f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toci_instack_ovb.sh
View File

@ -52,6 +52,13 @@ trap "exit_val=\$?; [ \$exit_val != 0 ] && echo ERROR DURING PREVIOUS COMMAND ^^
# Tempreverts/cherry-picks/pins go here. For example:
# temprevert tripleo-common af27127508eabf2b6873713e5e1507fa92b5f5b3 1623606
# https://bugs.launchpad.net/tripleo/+bug/1654032/
# we don't want to revert the patch for neutron's gate because they're
# trying to fix it at this time and need the broken patch.
if [[ "${ZUUL_PROJECT}" != "openstack/neutron" ]]; then
temprevert neutron 2ad9c679ed8718633732da1e97307f9fd9647dcc 1654032
fi
delorean_build_and_serve
# Since we've moved a few commands from this spot before the wget, we need to