reproducible builds: notify the correct channel(s)

7 files changed, 16 insertions, 13 deletions

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index dd165b8d..e7a5b30a 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -64,7 +64,7 @@ save_artifacts() {
 			if [ "$NOTIFY" = "diffoscope" ] ; then
 				MESSAGE="$MESSAGE (error running $DIFFOSCOPE)"
 			fi
-			irc_message "$MESSAGE"
+			irc_message debian-reproducible "$MESSAGE"
 		fi
 }
 
@@ -72,7 +72,7 @@ cleanup_all() {
 	if [ $SAVE_ARTIFACTS -eq 1 ] ; then
 		save_artifacts
 	elif [ ! -z "$NOTIFY" ] && [ $SAVE_ARTIFACTS -eq 0 ] ; then
-		irc_message "$REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS"
+		irc_message debian-reproducible "$REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE done: $STATUS"
 	fi
 	[ ! -f $RBUILDLOG ] || gzip -9fvn $RBUILDLOG
 	if [ "$MODE" = "master" ] ; then
@@ -104,7 +104,7 @@ update_db_and_html() {
 		  ( [ "$STATUS" = "unreproducible" ] || [ "$STATUS" = "FTBFS" ] ) ; then
 			MESSAGE="${REPRODUCIBLE_URL}/${SUITE}/${ARCH}/${SRCPACKAGE} : reproducible ➤ ${STATUS}"
 			echo -e "\n$MESSAGE" | tee -a ${RBUILDLOG}
-			irc_message "$MESSAGE"
+			irc_message debian-reproducible "$MESSAGE"
 			# disable ("regular") irc notification unless it's due to diffoscope problems
 			if [ ! -z "$NOTIFY" ] && [ "$NOTIFY" != "diffoscope" ] ; then
 				NOTIFY=""
@@ -224,7 +224,7 @@ handle_ftbfs() {
 		if zgrep -e "No space left on device" "$BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" ; then
 			MESSAGE="${BUILD_URL}console for ${SRCPACKAGE} (ftbfs in $SUITE/$ARCH) _probably_ had a diskspace issue on $node. Please check, tune handle_ftbfs() and reschedule the package."
 			echo $MESSAGE | tee -a /var/log/jenkins/reproducible-diskspace-issues.log
-			irc_message "$MESSAGE"
+			irc_message debian-reproducible "$MESSAGE"
 		fi
 	done
 	calculate_build_duration
@@ -393,7 +393,7 @@ call_diffoscope_on_buildinfo_files() {
 			;;
 		*)
 			handle_ftbr "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it"
-			irc_message "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it. Please check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE"
+			irc_message debian-reproducible "Something weird happened when running $DIFFOSCOPE (which exited with $RESULT) and I don't know how to handle it. Please check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE"
 			;;
 	esac
 }
@@ -459,12 +459,12 @@ choose_package() {
 		xxxxxxx)
 			export DEBUG=true
 			set -x
-			irc_message "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
+			irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
 			;;
 		*)      ;;
 	esac
 	if [ "$NOTIFY" = "2" ] ; then
-		irc_message "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
+		irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
 	elif [ "$NOTIFY" = "0" ] ; then  # the build script has a different idea of notify than the scheduler,
 		NOTIFY=''                  # the scheduler uses integers, build.sh uses strings.
 	fi
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 219374f7..84e2fc84 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -542,8 +542,10 @@ print_out_duration() {
 }
 
 irc_message() {
+	local CHANNEL="$1"
+	shift
 	local MESSAGE="$@"
-	kgb-client --conf /srv/jenkins/kgb/debian-reproducible.conf --relay-msg "$MESSAGE" || true # don't fail the whole job
+	kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$MESSAGE" || true # don't fail the whole job
 }
 
 call_diffoscope() {
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index ba704fb0..5744f0df 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -253,7 +253,7 @@ rm -f $LIST_OBJECT $TOOLCHAIN_HTML
 # the end
 calculate_build_duration
 print_out_duration
-irc_message "$REPRODUCIBLE_URL/coreboot/ has been updated. ($GOOD_PERCENT% reproducible)"
+irc_message reproducible-builds "$REPRODUCIBLE_URL/coreboot/ has been updated. ($GOOD_PERCENT% reproducible)"
 echo "============================================================================="
 
 # remove everything, we don't need it anymore...
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index dcd16fb8..f3bae5f7 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -231,7 +231,7 @@ publish_page
 calculate_build_duration
 print_out_duration
 FREEBSD_TARGET="master"
-irc_message "$REPRODUCIBLE_URL/freebsd/ has been updated. (${GOOD_PERCENT[$FREEBSD_TARGET]}% reproducible)"
+irc_message reproducible-builds "$REPRODUCIBLE_URL/freebsd/ has been updated. (${GOOD_PERCENT[$FREEBSD_TARGET]}% reproducible)"
 echo "============================================================================="
 
 # remove everything, we don't need it anymore...
diff --git a/bin/reproducible_html_specs.sh b/bin/reproducible_html_specs.sh
index 648cfbbf..b8b586aa 100755
--- a/bin/reproducible_html_specs.sh
+++ b/bin/reproducible_html_specs.sh
@@ -16,4 +16,5 @@ TARGET="specs/$(basename $SPEC -spec)"
 make $SPEC.html
 mkdir -pv "$BASE/$TARGET"
 mv -v $SPEC.html "$BASE/$TARGET/index.html"
-irc_message "$REPRODUCIBLE_DOT_ORG_URL/$TARGET/ updated to $VERSION"
+irc_message debian-reproducible "$REPRODUCIBLE_DOT_ORG_URL/$TARGET/ updated to $VERSION"
+irc_message reproducible-builds "$REPRODUCIBLE_DOT_ORG_URL/$TARGET/ updated to $VERSION"
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index aeb27b1d..c0ced11e 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -225,7 +225,7 @@ rm -f $FILES_HTML $GOOD_FILES_HTML $BAD_FILES_HTML $GOOD_SECTION_HTML $BAD_SECTI
 # the end
 calculate_build_duration
 print_out_duration
-irc_message "$REPRODUCIBLE_URL/netbsd/ has been updated. ($GOOD_PERCENT% reproducible)"
+irc_message reproducible-builds "$REPRODUCIBLE_URL/netbsd/ has been updated. ($GOOD_PERCENT% reproducible)"
 echo "============================================================================="
 
 # remove everything, we don't need it anymore...
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 119e2e0c..1de18e0a 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -362,7 +362,7 @@ rm -f $DBD_HTML $DBD_GOOD_PKGS_HTML $DBD_BAD_PKGS_HTML $TOOLCHAIN_HTML $BANNER_H
 # the end
 calculate_build_duration
 print_out_duration
-irc_message "$REPRODUCIBLE_URL/openwrt/ has been updated. ($GOOD_PERCENT_IMAGES% images and $GOOD_PERCENT_PACKAGES% packages reproducible)"
+irc_message reproducible-builds "$REPRODUCIBLE_URL/openwrt/ has been updated. ($GOOD_PERCENT_IMAGES% images and $GOOD_PERCENT_PACKAGES% packages reproducible)"
 echo "============================================================================="
 
 # remove everything, we don't need it anymore...