[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: refactoring, always echo irc_message to jenkins output too

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
6589dc83 by Holger Levsen at 2022-11-11T10:54:06+01:00
reproducible: refactoring, always echo irc_message to jenkins output too

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


5 changed files:

- bin/diffoscope_distribution_test.sh
- bin/reproducible_alpine_manual_scheduler.sh
- bin/reproducible_alpine_scheduler.sh
- bin/reproducible_archlinux_manual_scheduler.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/diffoscope_distribution_test.sh
=====================================
@@ -16,8 +16,7 @@ send_irc_warning() {
 	else
 		local CHANNEL="reproducible-changes"
 	fi
-	irc_message $CHANNEL "$WARNING"
-	echo "Warning: $WARNING"
+	irc_message $CHANNEL "Warning: $WARNING"
 }
 
 check_pypi() {


=====================================
bin/reproducible_alpine_manual_scheduler.sh
=====================================
@@ -63,7 +63,6 @@ if [ ! -z "$SUCCESS" ] ; then
 	if [ ${#MESSAGE} -gt 256 ] ; then
 		MESSAGE="${MESSAGE:0:256}✂…"
 	fi
-	echo "$MESSAGE"
 	irc_message alpine-reproducible "$MESSAGE"
 fi
 if [ ! -z "$ALREADY_SCHEDULED" ] || [ ! -z "$NOT_EXISTING" ] ; then


=====================================
bin/reproducible_alpine_scheduler.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2015-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2022 Holger Levsen <holger at layer-acht.org>
 #                2019 kpcyrd <git at rxv.cc>
 # released under the GPLv2
 


=====================================
bin/reproducible_archlinux_manual_scheduler.sh
=====================================
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2018 Holger Levsen <holger at layer-acht.org>
+# Copyright 2018-2022 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv2
 
 DEBUG=false
@@ -62,7 +62,6 @@ if [ ! -z "$SUCCESS" ] ; then
 	if [ ${#MESSAGE} -gt 256 ] ; then
 		MESSAGE="${MESSAGE:0:256}✂…"
 	fi
-	echo "$MESSAGE"
 	irc_message archlinux-reproducible "$MESSAGE"
 fi
 if [ ! -z "$ALREADY_SCHEDULED" ] || [ ! -z "$NOT_EXISTING" ] ; then


=====================================
bin/reproducible_common.sh
=====================================
@@ -694,6 +694,7 @@ irc_message() {
 	local MESSAGE="$@"
 	echo "Sending '$MESSAGE' to $CHANNEL now."
 	kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$MESSAGE" || echo "$(date -u) - couldn't send message to $CHANNEL, continuing anyway." # don't fail the whole job
+	echo "$MESSAGE"
 }
 
 call_diffoscope() {



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/6589dc83de7feb42e889ad4f691db50b5bf2e417

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/6589dc83de7feb42e889ad4f691db50b5bf2e417
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/20221111/52f3a2c9/attachment-0001.htm>