From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 14 Dec 2017 09:41:02 +0000 (+0100)
Subject: jenkins-build-all: improve detection of working buildserver VM
X-Git-Tag: 1.0.0~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=fdroidserver.git;a=commitdiff_plain;h=538d7155b439ccefd9133ced567f81e286ee943a

jenkins-build-all: improve detection of working buildserver VM

If I manually run some steps of the process, not all of the normal cruft
might be left behind.  I'm not really sure which of the multiple copies of
the images are actually required, but these both seem to work when present.
---

diff --git a/jenkins-build-all b/jenkins-build-all
index d41d920f..3308f61e 100755
--- a/jenkins-build-all
+++ b/jenkins-build-all
@@ -49,7 +49,8 @@ export VBOX_USER_HOME=$SETUP_WORKSPACE/VirtualBox
 export VAGRANT_HOME=$SETUP_WORKSPACE/vagrant.d
 
 # make sure we have the right buildserver paths and its ready for use
-vagrant global-status | grep reproducible_setup_fdroid_build_environment
+vagrant global-status \
+    | grep -F -e reproducible_setup_fdroid_build_environment -o -e fdroiddata/builder
 
 # the way we handle jenkins slaves doesn't copy the workspace to the slaves
 # so we need to "manually" clone the git repo here…