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 d41d920f79ef5e4b43a638fbbc2007d18babf5d1..3308f61ed2f0f998f59f77397340588244e3c9c7 100755 (executable)
--- 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…