kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

buildserver: fix jenkins build to support QEMU/KVM

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2016-09-15 14:38:36 +02:00
parent 3651e7eb9a
commit 988647a387
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jenkins-build-makebuildserver
View File

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
if [ `dirname $0` != "." ]; then if [ `dirname $0` != "." ]; then
@ -11,14 +12,15 @@ fi
# make sure that no VirtualBox processes are left running # make sure that no VirtualBox processes are left running
cleanup_all() { cleanup_all() {
set +e
echo "$(date -u) - cleanup in progress..." echo "$(date -u) - cleanup in progress..."
ps auxww|grep VBox ps auxww | grep -e VBox -e qemu
cd $WORKSPACE/buildserver cd $WORKSPACE/buildserver
vagrant halt || true vagrant halt
sleep 5 sleep 5
killall VBoxHeadless || true killall VBoxHeadless
sleep 5 sleep 5
killall -9 VBoxHeadless || true killall -9 VBoxHeadless
echo "$(date -u) - cleanup done." echo "$(date -u) - cleanup done."
} }
trap cleanup_all INT TERM EXIT trap cleanup_all INT TERM EXIT
@ -37,8 +39,10 @@ sha256sum -c jessie64.box.sha256
export XDG_CONFIG_HOME=$WORKSPACE export XDG_CONFIG_HOME=$WORKSPACE
export VBOX_USER_HOME=$WORKSPACE/VirtualBox export VBOX_USER_HOME=$WORKSPACE/VirtualBox
mkdir $VBOX_USER_HOME mkdir $VBOX_USER_HOME
VBoxManage setproperty machinefolder $WORKSPACE/virtualbox.d if which VBoxManage; then
VBoxManage setproperty logginglevel debug VBoxManage setproperty machinefolder $WORKSPACE/virtualbox.d
VBoxManage setproperty logginglevel debug
fi
export VAGRANT_HOME=$WORKSPACE/vagrant.d export VAGRANT_HOME=$WORKSPACE/vagrant.d
mkdir $VAGRANT_HOME mkdir $VAGRANT_HOME
@ -46,7 +50,7 @@ cd $WORKSPACE
echo "debian_mirror = 'http://ftp.uk.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py echo "debian_mirror = 'http://ftp.uk.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py
echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
./makebuildserver --verbose ./makebuildserver --verbose --clean
# 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