[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: reproducible debian: build.sh: fix ftbfs check after the last refactor

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net


Commits:
bbb991a3 by Mattia Rizzolo at 2018-06-20T09:59:45+02:00
reproducible debian: build.sh: fix ftbfs check after the last refactor

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
3d2d5ab7 by Mattia Rizzolo at 2018-06-20T09:59:55+02:00
reproducible debian: build.sh: drop spurious set -x

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
aadebb76 by Mattia Rizzolo at 2018-06-20T10:03:42+02:00
reproducible debian: build.sh: fix depwait case

without the `exit 0` the process would continue into back into the main
branch, ending up trying to run update_rbuildlog() twice and failing
because the rbuild has already been taken care of.

Also remove unneeded return statements (the program will exit before
they are reached).

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
b5b250cd by Mattia Rizzolo at 2018-06-20T10:05:58+02:00
reproducible debian: build.sh: silence the greps

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


1 changed file:

- bin/reproducible_build.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -204,10 +204,9 @@ diff_copy_buildlogs() {
 			gzip -9vn $DIFF
 			gzip -9cvn b2/build.log > $DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build2.log.gz
 			chmod 644 $DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build2.log.gz
-		elif [ $FTBFS -eq 0 ] ; then
+		elif [ "${1:-}" = "ftbfs" ] ; then
 			log_warning "No second build log, what happened?"
 		fi
-		set -x # # to debug diffoscope/schroot problems
 		echo "Compressing the 1st log..."
 		gzip -9cvn b1/build.log > $DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build1.log.gz
 		chmod 644 $DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build1.log.gz
@@ -237,6 +236,7 @@ handle_depwait() {
 	update_db_and_html "depwait"
 	if [ $SAVE_ARTIFACTS -eq 1 ] ; then SAVE_ARTIFACTS=0 ; fi
 	if [ -n "$NOTIFY" ] ; then NOTIFY="depwait" ; fi
+	exit 0
 }
 
 handle_NFU() {
@@ -253,7 +253,7 @@ handle_NFU() {
 handle_ftbfs() {
 	echo "${SRCPACKAGE} failed to build from source."
 	cleanup_pkg_files
-	diff_copy_buildlogs
+	diff_copy_buildlogs ftbfs
 	update_rbuildlog
 	local BUILD NEEDLE
 	for BUILD in "1" "2"; do
@@ -264,9 +264,8 @@ handle_ftbfs() {
 		if [ ! -f "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ] ; then
 			continue
 		fi
-		if zgrep -F "E: pbuilder-satisfydepends failed." "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ; then
+		if zgrep -q -F "E: pbuilder-satisfydepends failed." "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ; then
 			handle_depwait
-			return
 		fi
 		for NEEDLE in \
 			'^tar:.*Cannot write: No space left on device' \
@@ -280,9 +279,8 @@ handle_ftbfs() {
 			'^dpkg-source: error: cannot create directory .* No space left on device$' \
 			'Requested size .* exceeds available storage space .*\(No space left on device\)$' \
 			; do
-			if zgrep -e "$NEEDLE" "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ; then
+			if zgrep -q -e "$NEEDLE" "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ; then
 				handle_enospace $node
-				return
 			fi
 		done
 		# notify about unkown diskspace issues where we are not 100% sure yet those are diskspace issues



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/69544673f3203e3ea46b28918df5d1067c56228a...b5b250cdf01ef7e4724b1c9fe7aef76bab768178

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/69544673f3203e3ea46b28918df5d1067c56228a...b5b250cdf01ef7e4724b1c9fe7aef76bab768178
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180620/b487a87b/attachment-0001.html>