openstack/barbican
Code Issues Proposed changes

Updates to Devstack Variables

Browse Source 
The environment variable DEVSTACK_LOCAL_CONFIG can be set by the
gate directly or through the gate_hook.sh script.  This patch
changes gate_hook.sh to append to that variable, instead of settting
that variable, so not to overwrite any changes made by the gate
startup scripts.

Also, set the PYTHON environment variable to indicate python3
is used if indicated by the DEVSTACK_GATE variable.

Change-Id: I28f2fc0bc0a97bf52fa2ba4851a90e87ef22e992
This commit is contained in:
Dave McCowan 2017-03-28 11:15:52 -04:00
parent 5348d7050a
commit 1ffb958c5d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/gate_hook.sh
View File

@ -15,6 +15,8 @@
set -ex set -ex
# Install barbican devstack integration # Install barbican devstack integration
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican" if [ -z "$DEVSTACK_LOCAL_CONFIG" ]; then
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican"
fi
$BASE/new/devstack-gate/devstack-vm-gate.sh $BASE/new/devstack-gate/devstack-vm-gate.sh

7
functionaltests/post_test_hook.sh
View File

@ -24,4 +24,9 @@ sudo pip install -r /opt/stack/new/barbican/test-requirements.txt
cd /opt/stack/new/barbican/functionaltests cd /opt/stack/new/barbican/functionaltests
echo 'Running Functional Tests' echo 'Running Functional Tests'
sudo ./run_tests.sh $plugin
if [ "$DEVSTACK_GATE_USE_PYTHON3" = True ]; then
export PYTHON=$(which python3 2>/dev/null)
fi
sudo -E ./run_tests.sh $plugin