gitlab-ci: remove apt-get progress dumps from build log

[fdroidserver.git] / jenkins-build-all

diff --git a/jenkins-build-all b/jenkins-build-all
index d41d920f79ef5e4b43a638fbbc2007d18babf5d1..78a3239cf09d0147fe1ead83bb275594f250c41b 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…
@@ -75,8 +76,22 @@ else
 fi
 
 echo "build_server_always = True" > config.py
-$WORKSPACE/fdroid build --verbose --latest --no-tarball --all
+# if the local mediawiki is available, then use it
+if nc -z -w1 localhost 32445; then
+    wikiflag="--wiki"
+    echo "wiki_protocol = 'http'" >> config.py
+    echo "wiki_server = 'localhost:32445'" >> config.py
+    echo "wiki_path = '/mediawiki/'" >> config.py
+    echo "wiki_user = 'fdroid'" >> config.py
+    echo "wiki_password = 'update.TestCase'" >> config.py
+else
+    sed -i '/^wiki_/d' config.py
+fi
+
+$WORKSPACE/fdroid build --verbose --latest --no-tarball --all $wikiflag
 
 vagrant global-status
-cd builder
-vagrant status
+if [ -d builder ]; then
+    cd builder
+    vagrant status
+fi