[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible debian: build.sh: split notification handling to a different…

[Mattia Rizzolo]

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


Commits:
480cf7a2 by Mattia Rizzolo at 2018-06-20T14:26:58+02:00
reproducible debian: build.sh: split notification handling to a different function, and have it called only when running in master mode

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
@@ -105,9 +105,7 @@ save_artifacts() {
 		fi
 }
 
-cleanup_all() {
-	echo "Starting cleanup."
-	cd  # move out of $TMPDIR, if we are still inside
+notification() {
 	if [ "$SAVE_ARTIFACTS" = "1" ] ; then
 		save_artifacts  # this will also notify IRC as needed
 	else
@@ -125,12 +123,20 @@ cleanup_all() {
 				;;
 		esac
 	fi
+	# final compress, the RBUILDLOG is already in place.
 	[ ! -f $RBUILDLOG ] || gzip -9fvn $RBUILDLOG
+	# XXX quite ugly: this is just needed to update the sizes of the
+	# compressed files in the html. It's cheap and quite safe so, *shrugs*...
+	gen_package_html $SRCPACKAGE
+}
+
+cleanup_all() {
+	echo "Starting cleanup."
+	cd  # move out of $TMPDIR, if we are still inside
 	if [ "$MODE" = "master" ] ; then
-		# XXX quite ugly: this is just needed to update the sizes of the
-		# compressed files in the html. It's cheap and quite safe so, *shrugs*...
-		gen_package_html $SRCPACKAGE
-		cd
+		notification
+		# the TMPDIR in the remote nodes is removed by a later ssh call
+		# from master after the artifacts have been copied out.
 		rm -r $TMPDIR || true
 	fi
 	echo "All cleanup done."



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/480cf7a23baf582840ccc8b2fd1562eeaf7a3d64

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/480cf7a23baf582840ccc8b2fd1562eeaf7a3d64
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/1b8cb55a/attachment-0001.html>