[Qa-jenkins-scm] [jenkins.debian.net] 02/05: reproducible Arch Linux: skip gpg checks for future builds (expired keys)

[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 92460fde3a3b44a98f00c6390071d3c2eda76771
Author: anthraxx <levente at leventepolyak.net>
Date:   Fri Dec 8 23:26:22 2017 +0100

    reproducible Arch Linux: skip gpg checks for future builds (expired keys)
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 7bc083c..197aa55 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -123,13 +123,16 @@ first_build() {
 	local LOG=$TMPDIR/b1/$SRCPACKAGE/build1.log
 	local FUTURE_STATE="disabled"
 	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"
+	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
 	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
 		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"
+		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"
 	fi
 	echo "Future:            $FUTURE_STATE"
 	echo "SOURCE_DATE_EPOCH: $SOURCE_DATE_EPOCH"
 	echo "makepkg env:       $MAKEPKG_ENV_VARS"
+	echo "makepkg options:   $MAKEPKG_OPTIONS"
 	echo "============================================================================="
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
 	schroot --run-session -c $SESSION --directory /tmp -u root -- ln -sfT dash /usr/bin/sh
@@ -151,7 +154,7 @@ first_build() {
 	echo $VERSION > $TMPDIR/b1/$SRCPACKAGE/build1.version
 	# nicely run makepkg with a timeout of $TIMEOUT hours
 	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
-		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg --syncdeps --noconfirm 2>&1" | tee -a $LOG
+		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
@@ -195,13 +198,16 @@ second_build() {
 	NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
 	local FUTURE_STATE="disabled"
 	local MAKEPKG_ENV_VARS="SOURCE_DATE_EPOCH='$SOURCE_DATE_EPOCH'"
+	local MAKEPKG_OPTIONS="--syncdeps --noconfirm"
 	if [ "$(hostname -f)" = "profitbricks-build4-amd64" ] ; then
 		FUTURE_STATE="enabled"
 		MAKEPKG_ENV_VARS="$MAKEPKG_ENV_VARS GIT_SSL_NO_VERIFY=1"
+		MAKEPKG_OPTIONS="$MAKEPKG_OPTIONS --skippgpcheck"
 	fi
 	echo "Future:            $FUTURE_STATE"
 	echo "SOURCE_DATE_EPOCH: $SOURCE_DATE_EPOCH"
 	echo "makepkg env:       $MAKEPKG_ENV_VARS"
+	echo "makepkg options:   $MAKEPKG_OPTIONS"
 	echo "============================================================================="
 	schroot --begin-session --session-name=$SESSION -c jenkins-reproducible-archlinux
 	echo "MAKEFLAGS=-j$NEW_NUM_CPU" | schroot --run-session -c $SESSION --directory /tmp -u root -- tee -a /etc/makepkg.conf
@@ -227,7 +233,7 @@ second_build() {
 	echo $VERSION > $TMPDIR/b2/$SRCPACKAGE/build2.version
 	# nicely run makepkg with a timeout of $TIMEOUT hours
 	timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
-		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg --syncdeps --noconfirm 2>&1" | tee -a $LOG
+		schroot --run-session -c $SESSION --directory "$BUILDDIR/$ACTUAL_SRCPACKAGE/trunk" -- bash -l -c "$MAKEPKG_ENV_VARS makepkg $MAKEPKG_OPTIONS 2>&1" | tee -a $LOG
 	PRESULT=${PIPESTATUS[0]}
 	if [ $PRESULT -eq 124 ] ; then
 		echo "$(date -u) - makepkg was killed by timeout after ${TIMEOUT}h." | tee -a $LOG

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