Remove re-exec functionality

We now check out devstack-gate with zuul-cloner, therefore any
changes to d-g will be present before the run starts.  Since the
re-exec functionality existing to produce this effect internally,
it is no longer required.  Remove it.

Change-Id: I14b206932461dd425cda753621b61b4f46d90994
Depends-On: I2e926b55f8b9def4b7e238110c528bd2e5c82128

README.rst

@@ -210,7 +210,6 @@ probably look something like::
   export DEVSTACK_GATE_TIMEOUT=120
   export DEVSTACK_GATE_TEMPEST=1
   export DEVSTACK_GATE_TEMPEST_FULL=1
-  export RE_EXEC=true
   cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
   ./safe-devstack-vm-gate-wrap.sh
 

devstack-vm-gate-dev.sh

@@ -7,7 +7,6 @@ NODE_IP_ADDR=$1
 cat >$WORKSPACE/test-env.sh <<EOF
 export WORKSPACE=/home/jenkins/workspace
 export DEVSTACK_GATE_PREFIX=wip-
-export SKIP_DEVSTACK_GATE_PROJECT=1
 export DEVSTACK_GATE_TEMPEST=1
 export ZUUL_BRANCH=master
 export ZUUL_PROJECT=testing

devstack-vm-gate-wrap.sh

@@ -32,6 +32,7 @@ source $WORKSPACE/devstack-gate/functions.sh
 
 start_timer
 
+PROJECTS="openstack-infra/devstack-gate $PROJECTS"
 PROJECTS="openstack-dev/devstack $PROJECTS"
 PROJECTS="openstack-dev/grenade $PROJECTS"
 PROJECTS="openstack-dev/pbr $PROJECTS"
@@ -120,28 +121,6 @@ export BASE=/opt/stack
 # The URL from which to fetch ZUUL references
 export ZUUL_URL=${ZUUL_URL:-http://zuul.openstack.org/p}
 
-# Set this variable to skip updating the devstack-gate project itself.
-# Useful in development so you can edit scripts in place and run them
-# directly.  Do not set in production.
-# Normally not set, and we do include devstack-gate with the rest of
-# the projects.
-if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then
-    PROJECTS="openstack-infra/devstack-gate $PROJECTS"
-
-    # Also, if we're testing devstack-gate, re-exec this script once so
-    # that we can test the new version of it.
-    if [[ $ZUUL_CHANGES =~ "openstack-infra/devstack-gate" ]] && [[ $RE_EXEC != "true" ]]; then
-        echo "This build includes a change to devstack-gate; updating working copy."
-        # Since we're early in the script, we need to update the d-g
-        # copy in the workspace, not $DEST, which is what will be
-        # updated later.
-        setup_project openstack-infra/devstack-gate $GIT_BRANCH
-        cd $WORKSPACE
-
-        re_exec_devstack_gate
-    fi
-fi
-
 # The feature matrix to select devstack-gate components
 export DEVSTACK_GATE_FEATURE_MATRIX=${DEVSTACK_GATE_FEATURE_MATRIX:-features.yaml}
 

functions.sh

@@ -368,12 +368,6 @@ function setup_project {
     fi
 }
 
-function re_exec_devstack_gate {
-    export RE_EXEC="true"
-    echo "This build includes a change to devstack-gate; re-execing this script."
-    exec $WORKSPACE/devstack-gate/devstack-vm-gate-wrap.sh
-}
-
 function setup_workspace {
     local base_branch=$1
     local DEST=$2