From 321a75154947a5720928c9cafafea523a7d04b20 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 19 Jun 2013 17:32:29 -0700 Subject: [PATCH] Always restart devstack-gate when testing itself. Devstack-gate was only restarting itself when the ZUUL_PROJECT was devstack-gate. In the zuul gate queue projects are stacked and ZUUL_PROJECT may be some other project when ZUUL_CHANGES includes a change to devstack-gate. Restart devstack-gate whenever it is part of ZUUL_CHANGES. Change-Id: I1c34917bf2b1dbc732eb1d36c3b7c30a1d8822bd --- devstack-vm-gate-wrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 3d3e1f87..0d9fd9d6 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -320,7 +320,7 @@ setup_workspace $BASE/new 1 &> \ # Also, if we're testing devstack-gate, re-exec this script once so # that we can test the new version of it. -if [[ $ZUUL_PROJECT == "openstack-infra/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then +if [[ $ZUUL_CHANGES =~ "openstack-infra/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then export RE_EXEC="true" echo "This build includes a change to the devstack gate; re-execing this script." exec $GATE_SCRIPT_DIR/devstack-vm-gate-wrap.sh