openstack
/
murano
Code Issues Proposed changes

Merge "use . instead of source."

This commit is contained in:
Zuul 2018-02-11 02:11:18 +00:00 committed by Gerrit Code Review
parent 36eae7e3cb 3186a72942
commit fdaf7464f3
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -496,7 +496,7 @@ function configure_murano_tempest_plugin() {
# - configure_murano_dashboard # - configure_murano_dashboard
# - cleanup_murano_dashboard # - cleanup_murano_dashboard
source $TOP_DIR/lib/horizon . $TOP_DIR/lib/horizon
# Defaults # Defaults
# -------- # --------

2
functionaltests/pre_test_hook.sh
View File

@ -3,6 +3,6 @@
# This script is executed inside pre_test_hook function in devstack gate. # This script is executed inside pre_test_hook function in devstack gate.
# Install Murano devstack integration # Install Murano devstack integration
source ./pre_test_hook_common.sh . ./pre_test_hook_common.sh
MURANO_BASE=/opt/stack/new/murano/contrib/devstack MURANO_BASE=/opt/stack/new/murano/contrib/devstack

2
functionaltests/pre_test_hook_congress.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Install Congress devstack integration # Install Congress devstack integration
source ./pre_test_hook_common.sh . ./pre_test_hook_common.sh
CONGRESS_BASE=/opt/stack/new/congress/contrib/devstack CONGRESS_BASE=/opt/stack/new/congress/contrib/devstack

2
functionaltests/pre_test_hook_mistral.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Install Mistral devstack integration # Install Mistral devstack integration
source ./pre_test_hook_common.sh . ./pre_test_hook_common.sh
MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack

4
functionaltests/run_tests.sh
View File

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
source ./run_tests_common.sh . ./run_tests_common.sh
MURANO_ROOT=/opt/stack/new/murano/murano MURANO_ROOT=/opt/stack/new/murano/murano
# Using .venv for tempest installation # Using .venv for tempest installation
pushd $TEMPEST_DIR pushd $TEMPEST_DIR
python "$MURANO_ROOT/tools/install_venv.py" python "$MURANO_ROOT/tools/install_venv.py"
source "$MURANO_ROOT/.venv/bin/activate" . "$MURANO_ROOT/.venv/bin/activate"
pip install nose pip install nose
nosetests -sv "$MURANO_ROOT/tests/functional/api/v1" nosetests -sv "$MURANO_ROOT/tests/functional/api/v1"
RETVAL=$? RETVAL=$?

2
functionaltests/run_tests_congress_mistral.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
source ./run_tests_common.sh . ./run_tests_common.sh
# Add tempest source tree to PYTHONPATH # Add tempest source tree to PYTHONPATH
export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR