From 0cc7bc20cd28b26d4ef1de3036981ac585b25c5f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 28 May 2013 11:58:36 -0700 Subject: [PATCH] Set $BASE before $GATE_SCRIPT_DIR. * devstack-vm-gate-wrap.sh: $BASE was used to construct $GATE_SCRIPT_DIR but $BASE was set after $GATE_SCRIPT_DIR. Move the order of assignments to fix this. Change-Id: Ic6ee8f7f0a1db0c191e37fd3eec1d970752c8db0 --- devstack-vm-gate-wrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 0cd4b57e..4ec10326 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -70,6 +70,8 @@ export DEVSTACK_GATE_VIRT_DRIVER=${DEVSTACK_GATE_VIRT_DRIVER:-libvirt} # is the project being gated. export DEVSTACK_GATE_TEMPEST_FULL=${DEVSTACK_GATE_TEMPEST_FULL:-0} +export BASE=/opt/stack + # Set GATE_SCRIPT_DIR to point to devstack-gate in the workspace so that # we are testing the proposed change from this point forward. GATE_SCRIPT_DIR=$BASE/new/devstack-gate @@ -83,8 +85,6 @@ if [ -z "$SKIP_DEVSTACK_GATE_PROJECT" ]; then PROJECTS="openstack-infra/devstack-gate $PROJECTS" fi -export BASE=/opt/stack - # Most of the work of this script is done in functions so that we may # easily redirect their stdout / stderr to log files.