networking-midonet: Fix gate_hook check

The check was completely broken. i.e. it tries to check the existence
of the file even before the tree is prepared.

Simply check ZUUL_BRANCH instead.

Closes-Bug: #1552033
Depends-On: I20407b00d47ff2b5119ef5b9f077f6f97683db49
Change-Id: If763f5259e54decb8531df4edac8e58d3064d2b8
This commit is contained in:
YAMAMOTO Takashi 2016-08-26 11:52:40 +09:00
parent 21787a7975
commit 6c1e703435

View File

@ -27,7 +27,7 @@
# reference magic for testing changes.
export PROJECTS="openstack/networking-midonet $PROJECTS"
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
if [[ ! "stable/liberty stable/mitaka" =~ $ZUUL_BRANCH ]]; then
function gate_hook {{
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v1
}}
@ -91,7 +91,7 @@
export PROJECTS="openstack/networking-midonet $PROJECTS"
export PROJECTS="openstack/tap-as-a-service $PROJECTS"
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
if [[ ! "stable/liberty stable/mitaka" =~ $ZUUL_BRANCH ]]; then
function gate_hook {{
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v2
}}
@ -149,7 +149,7 @@
export PROJECTS="openstack/networking-midonet $PROJECTS"
export PROJECTS="openstack/tap-as-a-service $PROJECTS"
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
if [[ ! "stable/liberty stable/mitaka" =~ $ZUUL_BRANCH ]]; then
function gate_hook {{
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ml2
}}
@ -206,7 +206,7 @@
export PROJECTS="openstack/networking-midonet $PROJECTS"
export PROJECTS="openstack/rally $PROJECTS"
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
if [[ ! "stable/liberty stable/mitaka" =~ $ZUUL_BRANCH ]]; then
function gate_hook {{
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh rally
}}