jenkins makebuildserver fail if vagrant box was not created

This commit is contained in:
Michael Pöhn 2017-03-24 00:49:02 +01:00 committed by Hans-Christoph Steiner
parent 2993674aa8
commit 437ff7c3f0

View file

@ -54,6 +54,12 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
echo "copy_caches_from_host = True" >> $WORKSPACE/makebuildserver.config.py echo "copy_caches_from_host = True" >> $WORKSPACE/makebuildserver.config.py
./makebuildserver --verbose --clean ./makebuildserver --verbose --clean
if [ -z "`vagrant box list | egrep '^buildserver\s+\((libvirt|virtualbox), [0-9]+\)$'`" ]; then
vagrant box list
echo "ERROR: buildserver box does not exist!"
exit 1
fi
# this can be handled in the jenkins job, or here: # this can be handled in the jenkins job, or here:
if [ -e fdroiddata ]; then if [ -e fdroiddata ]; then
cd fdroiddata cd fdroiddata
@ -73,7 +79,7 @@ if [ -z $ANDROID_HOME ]; then
. ~/.android/bashrc . ~/.android/bashrc
else else
echo "ANDROID_HOME must be set!" echo "ANDROID_HOME must be set!"
exit exit 1
fi fi
fi fi