openstack/octavia-dashboard
Code Issues Proposed changes

Fix gate scripts to use script dir for sourcing commons

Browse Source 
The gate job calls the hook scripts directly, without
changing the current directory.  So we need to source the
commons script from the hook script directory.
Also fix typo in screen dir env var name.

Change-Id: I2fb3759307035e63e6bec9c4f1cdf568e178ebb2
This commit is contained in:
Mark Vanderwiel 2016-03-08 11:41:39 -06:00
parent 48ae48f04f
commit ca03ae860a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/gate/integration/commons
View File

@ -2,4 +2,4 @@
set -ex set -ex
export LBAAS_DASHBOARD_SCREENSHOTS_DIR=/opt/stack/new/neutron-lbaas-dashboard/.tox/py27integration/src/horizon/openstack_dashboard/test/integration_tests/integration_tests_screenshots export NEUTRON_LBAAS_DASHBOARD_SCREENSHOTS_DIR=/opt/stack/new/neutron-lbaas-dashboard/.tox/py27integration/src/horizon/openstack_dashboard/test/integration_tests/integration_tests_screenshots

4
tools/gate/integration/post_test_hook.sh
View File

@ -3,7 +3,9 @@
# This script will be executed inside post_test_hook function in devstack gate # This script will be executed inside post_test_hook function in devstack gate
set -x set -x
source commons $@
DIR=${BASH_SOURCE%/*}
source $DIR/commons $@
set +e set +e
cd /opt/stack/new/neutron-lbaas-dashboard cd /opt/stack/new/neutron-lbaas-dashboard

4
tools/gate/integration/pre_test_hook.sh
View File

@ -3,7 +3,9 @@
# This script will be executed inside pre_test_hook function in devstack gate # This script will be executed inside pre_test_hook function in devstack gate
set -ex set -ex
source commons $@
DIR=${BASH_SOURCE%/*}
source $DIR/commons $@
# Enable LBaaS V2 Neutron plugin # Enable LBaaS V2 Neutron plugin
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"