Merge "Updates to Devstack Variables"

devstack/gate_hook.sh

@@ -15,6 +15,8 @@
 set -ex
 
 # Install barbican devstack integration
+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

functionaltests/post_test_hook.sh

@@ -24,4 +24,9 @@ sudo pip install -r /opt/stack/new/barbican/test-requirements.txt
 
 cd /opt/stack/new/barbican/functionaltests
 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