openstack
/
fuel-plugin-murano-tests
Code Issues Proposed changes

Alight names with CI 

* Fix passing from CI FUEL_QA_COMMIT
 * Fix *test.py runner

Change-Id: Icd25db5b4641436be4606a534526964290647754
This commit is contained in:
alexz 2016-09-29 15:06:31 +03:00
parent 20b10b6062
commit 7e4898097d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
murano_plugin_tests/run_tests.py → murano_plugin_tests/run_system_test.py
View File

4
openrc.default
View File

@ -10,8 +10,8 @@ export ADMIN_NODE_CPU=2
export SLAVE_NODE_MEMORY=6144
# Locations for fuel-qa, MOS and plugins artifacts
export FUELQA_GITREF=stable/mitaka
export FUEL_QA_COMMIT=stable/mitaka
export ISO_PATH=$HOME/iso/MirantisOpenStack-9.0.iso
# Location of the plugin
export MURANO_PLUGIN_PATH=$HOME/plugins/detach-murano-1.0-1.0.0-1.noarch.rpm
export MURANO_PLUGIN_PATH=$HOME/plugins/detach-murano-1.0-1.0.0-1.noarch.rpm

2
utils/fuel-qa-builder/prepare_env.sh
View File

@ -8,7 +8,7 @@ set -e
# Initialize the variables
BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
VENV_PATH=${VENV_PATH:-"${BASE_DIR}"/venv-murano-tests}
FUELQA_GITREF=${FUELQA_GITREF:-stable/mitaka}
FUELQA_GITREF=${FUEL_QA_COMMIT:-stable/mitaka}
# Create the virtual environment if it doesn't exist yet
if [[ ! -f "$VENV_PATH"/bin/activate ]]; then

4
utils/jenkins/system_tests.sh
View File

@ -430,11 +430,11 @@ RunTest() {
# run python test set to create environments, deploy and test product
if [ "${DRY_RUN}" = "yes" ]; then
echo export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
echo python murano_plugin_tests/run_tests.py -q --nologcapture --with-xunit ${OPTS}
echo python murano_plugin_tests/run_system_test.py -q --nologcapture --with-xunit ${OPTS}
else
export PYTHONPATH="${PYTHONPATH:+${PYTHONPATH}:}${WORKSPACE}"
echo ${PYTHONPATH}
python murano_plugin_tests/run_tests.py -q --nologcapture --with-xunit ${OPTS}
python murano_plugin_tests/run_system_test.py -q --nologcapture --with-xunit ${OPTS}
fi
ec=$?