From df326cfa6bdf863eb9e803d01b54ae28a08b7174 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 20 Apr 2017 17:19:43 +0200 Subject: reproducible F-Droid: more naming fixes Signed-off-by: Holger Levsen --- bin/jenkins_node_wrapper.sh | 4 +- bin/reproducible_fdroid_build_all_profitbricks7.sh | 78 ---------------------- bin/reproducible_fdroid_build_apps.sh | 78 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 bin/reproducible_fdroid_build_all_profitbricks7.sh create mode 100644 bin/reproducible_fdroid_build_apps.sh (limited to 'bin') diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index 72d2d586..3e3af289 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -129,8 +129,8 @@ elif [[ "$*" =~ ^reproducible_freebsd ]] ; then exec /srv/jenkins/bin/reproducible_freebsd.sh ; croak "Exec failed"; elif [[ "$*" =~ ^reproducible_setup_schroot_archlinux ]] ; then exec /srv/jenkins/bin/reproducible_setup_archlinux_schroot.sh ; croak "Exec failed"; -elif [[ "$*" =~ ^reproducible_fdroid_build_all ]] ; then - exec /srv/jenkins/bin/reproducible_fdroid_build_all.sh ; croak "Exec failed"; +elif [[ "$*" =~ ^reproducible_fdroid_build_apps ]] ; then + exec /srv/jenkins/bin/reproducible_fdroid_build_apps.sh ; croak "Exec failed"; elif [[ "$*" =~ ^reproducible_setup_fdroid_build_environment ]] ; then exec /srv/jenkins/bin/reproducible_setup_fdroid_build_environment.sh ; croak "Exec failed"; elif [[ "$*" =~ ^reproducible_setup_mock_fedora-23_x86_64 ]] ; then diff --git a/bin/reproducible_fdroid_build_all_profitbricks7.sh b/bin/reproducible_fdroid_build_all_profitbricks7.sh deleted file mode 100644 index cbc25a77..00000000 --- a/bin/reproducible_fdroid_build_all_profitbricks7.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# Copyright 2015-2016 Holger Levsen -# released under the GPLv=2 - -# -# - -DEBUG=true -. /srv/jenkins/bin/common-functions.sh -common_init "$@" - -# common code -. /srv/jenkins/bin/reproducible_common.sh - -# define and clean work space (differently than jenkins would normally do as we run via ssh on a different node…) -WORKSPACE=$BASE/fdroid-build -rm $WORKSPACE -rf -mkdir -p $WORKSPACE - -cleanup_all() { - echo "$(date -u) - cleanup in progress..." - killall VBoxHeadless || true - sleep 10 - echo "$(date -u) - cleanup done." -} -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=$WORKSPACE/VirtualBox -export VAGRANT_HOME=$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 - - -# remove trap -trap - INT TERM EXIT -echo "$(date -u) - the end." diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh new file mode 100644 index 00000000..cbc25a77 --- /dev/null +++ b/bin/reproducible_fdroid_build_apps.sh @@ -0,0 +1,78 @@ +#!/bin/bash + +# Copyright 2015-2016 Holger Levsen +# released under the GPLv=2 + +# +# + +DEBUG=true +. /srv/jenkins/bin/common-functions.sh +common_init "$@" + +# common code +. /srv/jenkins/bin/reproducible_common.sh + +# define and clean work space (differently than jenkins would normally do as we run via ssh on a different node…) +WORKSPACE=$BASE/fdroid-build +rm $WORKSPACE -rf +mkdir -p $WORKSPACE + +cleanup_all() { + echo "$(date -u) - cleanup in progress..." + killall VBoxHeadless || true + sleep 10 + echo "$(date -u) - cleanup done." +} +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=$WORKSPACE/VirtualBox +export VAGRANT_HOME=$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 + + +# remove trap +trap - INT TERM EXIT +echo "$(date -u) - the end." -- cgit v1.2.3-70-g09d2