[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: move script to fdroid git repo for fast test cycles

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 67719b1cdb0beb7404e300361281fa9f3a19a6f2
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Apr 24 12:26:50 2017 +0200

    reproducible fdroid: move script to fdroid git repo for fast test cycles
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_fdroid_build_apps.sh | 47 +----------------------------------
 job-cfg/reproducible.yaml             |  2 +-
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index 6728050..dc08735 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -27,52 +27,7 @@ cleanup_all() {
 }
 trap cleanup_all INT TERM EXIT
 
-# report info about virtualization
-(dmesg | grep -i -e hypervisor -e qemu -e kvm) || true
-(lspci | grep -i -e virtio -e virtualbox -e qemu -e kvm) || true
-lsmod
-if systemd-detect-virt -q ; then
-        echo "Virtualization is used:" `systemd-detect-virt`
-else
-        echo "No virtualization is used."
-fi
-sudo /bin/chmod -R a+rX /var/lib/libvirt/images
-ls -ld /var/lib/libvirt/images
-ls -l /var/lib/libvirt/images || echo no access
-ls -lR ~/.vagrant.d/ || echo no access
-virsh --connect qemu:///system list --all || echo cannot virsh list
-cat /etc/issue
-
-# point to the Vagrant/VirtualBox configs created by reproducible_setup_fdroid_build_environment.sh
-# these variables are actually set in fdroidserver/jenkins-build-makebuildserver
-SETUP_WORKSPACE=$BASE/fdroid
-export XDG_CONFIG_HOME=$SETUP_WORKSPACE
-export VBOX_USER_HOME=$SETUP_WORKSPACE/VirtualBox
-export VAGRANT_HOME=$SETUP_WORKSPACE/vagrant.d
-
-# the way we handle jenkins slaves doesn't copy the workspace to the slaves
-# so we need to "manually" clone the git repo here…
-cd $WORKSPACE
-#git clone https://gitlab.com/fdroid/fdroidserver.git
-git clone https://gitlab.com/uniqx/fdroidserver.git
-cd fdroidserver
-git checkout jenkins.debian.net # normally master too
-
-# set up Android SDK to use the Debian packages in stretch
-export ANDROID_HOME=/usr/lib/android-sdk
-
-# ignore username/password prompt for non-existant repos
-git config --global url."https://fakeusername:fakepassword@github.com".insteadOf https://github.com
-git config --global url."https://fakeusername:fakepassword@gitlab.com".insteadOf https://gitlab.com
-git config --global url."https://fakeusername:fakepassword@bitbucket.org".insteadOf https://bitbucket.org
-
-# now build the whole archive
-cd $WORKSPACE
-git clone https://gitlab.com/fdroid/fdroiddata.git
-cd fdroiddata
-echo "build_server_always = True" > config.py
-$WORKSPACE/fdroidserver/fdroid build --verbose --latest --all
-
+./jenkins-build
 
 # remove trap
 trap - INT TERM EXIT
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index b3fedd8..5ad83ce 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -866,7 +866,7 @@
                     my_description: 'Build all the latest apps for F-Droid.'
                     my_timed: '42 7 * * 1'
                     my_hname: 'profitbricks7'
-                    my_gitrepo: 'https://gitlab.com/fdroid/fdroidserver.git'
+                    my_gitrepo: 'https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net.git'
                     my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org hans at guardianproject.info michael.poehn at fsfe.org'
                 - 'diffoscope_from_git_master':
                     my_description: 'Build diffoscope Debian package from git branch master.'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git