[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible archlinux: refactor

[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 d1da1bd375818eb798ef755f71d01e964b8e4d1c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Dec 10 12:40:10 2015 +0100

    reproducible archlinux: refactor
---
 bin/reproducible_build_archlinux_pkg.sh | 56 ++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 5cd509d..7fea6dc 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -38,6 +38,35 @@ handle_remote_error() {
 	exit 0
 }
 
+choose_package() {
+	#SESSION="arch-scheduler-$RANDOM"
+	#schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-arch
+	#PACKAGES="$(schroot --run-session -c $SESSION --directory /var/abs/core -- ls -1|sort -R|xargs echo)"
+	#schroot --end-session -c $SESSION
+	#SRCPACKAGE=""
+	PACKAGES="acl archlinux-keyring attr autoconf automake b43-fwcutter bash binutils bison bridge-utils btrfs-progs bzip2 ca-certificates ca-certificates-cacert coreutils cracklib crda cronie cryptsetup curl dash db dbus dhcpcd dialog diffutils ding-libs dmraid dnssec-anchors dosfstools e2fsprogs ed efibootmgr efivar elfutils expat fakeroot file filesystem findutils flex gawk gcc gdbm gettext glib2 glibc gmp gnupg gnutls gpgme gpm grep groff grub gssproxy gzip hdparm hwids iana-etc ifensla [...]
+	for PKG in $PACKAGES ; do
+		# build package if it has never build or at least a week ago
+		if [ ! -d $BASE/archlinux/$PKG ] || [ ! -z $(find $BASE/archlinux/ -name $PKG -mtime +6) ] ; then
+			SRCPACKAGE=$PKG
+			echo "Building $PKG now..."
+			# very simple locking…
+			mkdir -p $BASE/archlinux/$PKG
+			touch $BASE/archlinux/$PKG
+			break
+		fi
+	done
+	if [ -z $SRCPACKAGE ] ; then
+		echo "$(date -u ) - no package found to be build, sleeping 6h."
+		for i in $(seq 1 12) ; do
+			sleep 30m
+			echo "$(date -u ) - still sleeping..."
+		done
+		echo "$(date -u ) - exiting cleanly now."
+		exit 0
+	fi
+}
+
 first_build() {
 	echo "============================================================================="
 	echo "Building ${SRCPACKAGE} for Arch Linux on $(hostname -f) now."
@@ -175,32 +204,7 @@ fi
 #
 delay_start # randomize start times
 # first, we need to choose a package…
-#SESSION="arch-scheduler-$RANDOM"
-#schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-arch
-#PACKAGES="$(schroot --run-session -c $SESSION --directory /var/abs/core -- ls -1|sort -R|xargs echo)"
-#schroot --end-session -c $SESSION
-#SRCPACKAGE=""
-PACKAGES="acl archlinux-keyring attr autoconf automake b43-fwcutter bash binutils bison bridge-utils btrfs-progs bzip2 ca-certificates ca-certificates-cacert coreutils cracklib crda cronie cryptsetup curl dash db dbus dhcpcd dialog diffutils ding-libs dmraid dnssec-anchors dosfstools e2fsprogs ed efibootmgr efivar elfutils expat fakeroot file filesystem findutils flex gawk gcc gdbm gettext glib2 glibc gmp gnupg gnutls gpgme gpm grep groff grub gssproxy gzip hdparm hwids iana-etc ifenslav [...]
-for PKG in $PACKAGES ; do
-	# build package if it has never build or at least a week ago
-	if [ ! -d $BASE/archlinux/$PKG ] || [ ! -z $(find $BASE/archlinux/ -name $PKG -mtime +6) ] ; then
-		SRCPACKAGE=$PKG
-		echo "Building $PKG now..."
-		# very simple locking…
-		mkdir -p $BASE/archlinux/$PKG
-		touch $BASE/archlinux/$PKG
-		break
-	fi
-done
-if [ -z $SRCPACKAGE ] ; then
-	echo "$(date -u ) - no package found to be build, sleeping 6h."
-	for i in $(seq 1 12) ; do
-		sleep 30m
-		echo "$(date -u ) - still sleeping..."
-	done
-	echo "$(date -u ) - exiting cleanly now."
-	exit 0
-fi
+choose_package
 # build package twice
 mkdir b1 b2
 remote_build 1

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