Merge "Fix mistral gate job"
This commit is contained in:
commit
1dc074c293
0
functionaltests/api/v1/__init__.py
Normal file
0
functionaltests/api/v1/__init__.py
Normal file
@ -17,10 +17,15 @@
|
||||
|
||||
RETVAL=0
|
||||
|
||||
cd /opt/stack/new/
|
||||
|
||||
echo "Repository: $ZUUL_PROJECT"
|
||||
|
||||
#Run API tests only for mistral repository
|
||||
if [[ "$ZUUL_PROJECT" == "stackforge/mistral" ]]; then
|
||||
cd /opt/stack/new/mistral/functionaltests
|
||||
sudo ./run_tests.sh
|
||||
cd mistral/
|
||||
echo "Run mistral API tests"
|
||||
sudo bash ./functionaltests/run_tests.sh
|
||||
RETVAL=$?
|
||||
# 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
|
||||
@ -28,8 +33,9 @@ fi
|
||||
|
||||
#Run client tests for both repositories: mistral and python-mistralclient
|
||||
if [[ RETVAL -eq 0 ]]; then
|
||||
cd /opt/stack/new/python-mistralclient/functionaltests
|
||||
sudo ./run_tests.sh
|
||||
cd /opt/stack/new/python-mistralclient/
|
||||
echo "Run mistralclient tests"
|
||||
sudo bash ./functionaltests/run_tests.sh
|
||||
RETVAL=$?
|
||||
fi
|
||||
|
||||
|
@ -25,7 +25,15 @@ echo "Successfully contacted Mistral API"
|
||||
# Where tempest code lives
|
||||
TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}
|
||||
|
||||
# Add tempest source tree to PYTHONPATH
|
||||
export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR
|
||||
# Where mistral code and mistralclient code live
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user