openstack/deb-mistral
Code Issues Proposed changes

Merge "Fix mistral gate job"

Browse Source
This commit is contained in:
Jenkins 2014-07-30 12:19:16 +00:00 committed by Gerrit Code Review
commit 1dc074c293
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
functionaltests/api/v1/__init__.py Normal file
View File

14
functionaltests/post_test_hook.sh
View File

@ -17,10 +17,15 @@
RETVAL=0 RETVAL=0
cd /opt/stack/new/
echo "Repository: $ZUUL_PROJECT"
#Run API tests only for mistral repository #Run API tests only for mistral repository
if [[ "$ZUUL_PROJECT" == "stackforge/mistral" ]]; then if [[ "$ZUUL_PROJECT" == "stackforge/mistral" ]]; then
cd /opt/stack/new/mistral/functionaltests cd mistral/
sudo ./run_tests.sh echo "Run mistral API tests"
sudo bash ./functionaltests/run_tests.sh
RETVAL=$? RETVAL=$?
# Copy tempest log files to be published among other logs upon job completion # Copy tempest log files to be published among other logs upon job completion
sudo cp /opt/stack/new/mistral/functionaltests/tempest.log /opt/stack/logs sudo cp /opt/stack/new/mistral/functionaltests/tempest.log /opt/stack/logs
@ -28,8 +33,9 @@ fi
#Run client tests for both repositories: mistral and python-mistralclient #Run client tests for both repositories: mistral and python-mistralclient
if [[ RETVAL -eq 0 ]]; then if [[ RETVAL -eq 0 ]]; then
cd /opt/stack/new/python-mistralclient/functionaltests cd /opt/stack/new/python-mistralclient/
sudo ./run_tests.sh echo "Run mistralclient tests"
sudo bash ./functionaltests/run_tests.sh
RETVAL=$? RETVAL=$?
fi fi

14
functionaltests/run_tests.sh
View File

@ -25,7 +25,15 @@ echo "Successfully contacted Mistral API"
# Where tempest code lives # Where tempest code lives
TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}
# Add tempest source tree to PYTHONPATH # Where mistral code and mistralclient code live
export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR MISTRAL_DIR=/opt/stack/new/mistral
MISTRALCLIENT_DIR=/opt/stack/new/python-mistralclient
nosetests -sv api/v1 # Define PYTHONPATH
export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR
export PYTHONPATH=$PYTHONPATH:$MISTRAL_DIR
export PYTHONPATH=$PYTHONPATH:$MISTRALCLIENT_DIR
echo $PYTHONPATH
pwd
nosetests -sv functionaltests