summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2016-01-26 17:43:02 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-26 21:38:34 +0100
commit286b9d42a3af04cbaa9d2dde6fb9ca17e1c50895 (patch)
tree17d54317aa7c83561d563a0d7ebd8c7abd0fc87a
parentca82685d9661516677fac38587125ad003d9fc81 (diff)
downloadjenkins.debian.net-286b9d42a3af04cbaa9d2dde6fb9ca17e1c50895.tar.xz
reproducible fdroid: add 30m timeout and try to shutdown cleanly
This was failing because the default 5m timeout was too short. Also, test that the VM can be properly shutdown too.
-rwxr-xr-xbin/reproducible_setup_fdroid_build_environment.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index 67a64b82..218fffa0 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -50,8 +50,13 @@ rm -rf $VAGRANT_HOME
cd $WORKSPACE
git clone https://gitlab.com/fdroid/fdroidserver.git
cd fdroidserver
+echo "boot_timeout = 1200" > makebuildserver.config.py
./makebuildserver
+# we are done here, shutdown
+cd buildserver
+vagrant halt
+
# remove trap
trap - INT TERM EXIT
echo "$(date -u) - the end."