openstack/barbican
Code Issues Proposed changes

Merge "Updates to Devstack Variables"

Browse Source
This commit is contained in:
Jenkins 2017-04-05 13:34:50 +00:00 committed by Gerrit Code Review
commit 455d6f88b7
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