[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible Debian: use console.log for service builds

Holger Levsen holger at layer-acht.org
Thu Apr 27 14:01:10 UTC 2017 

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 563cc36a09d8b05b1b4f9d7c265fa3faff4c4c53
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Apr 27 15:59:50 2017 +0200

    reproducible Debian: use console.log for service builds
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build.sh            | 18 +++++++++---------
 bin/reproducible_html_live_status.py |  2 +-
 bin/reproducible_worker.sh           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 127fe72..c483420 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -273,7 +273,7 @@ handle_ftbfs() {
 		# notify about unkown diskspace issues where we are not 100% sure yet those are diskspace issues
 		# ignore syslinux, which is a false positive…
 		if zgrep -e "No space left on device" "$DEBIAN_BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build${BUILD}.log.gz" && [ "$SRCPACKAGE" != "syslinux" ] ; 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."
+			MESSAGE="${BUILD_URL}console.log 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 debian-reproducible "$MESSAGE"
 		fi
@@ -332,7 +332,7 @@ unregister_build() {
 
 handle_env_changes() {
 	unregister_build
-	MESSAGE="$(date -u ) - ${BUILD_URL}console encountered a problem: $1"
+	MESSAGE="$(date -u ) - ${BUILD_URL}console.log encountered a problem: $1"
 	echo -e "$MESSAGE" | tee -a /var/log/jenkins/reproducible-env-changes.log
 	# no need to slow down
 	exec /srv/jenkins/bin/abort.sh
@@ -341,7 +341,7 @@ handle_env_changes() {
 
 handle_remote_error() {
 	unregister_build
-	MESSAGE="${BUILD_URL}console got remote error $1"
+	MESSAGE="${BUILD_URL}console.log got remote error $1"
 	echo "$(date -u ) - $MESSAGE" | tee -a /var/log/jenkins/reproducible-remote-error.log
 	echo "Sleeping 5m before aborting the job."
 	sleep 5m
@@ -351,7 +351,7 @@ handle_remote_error() {
 
 handle_enospace() {
 	unregister_build
-	MESSAGE="${BUILD_URL}console hit diskspace issues with $SRCPACKAGE on $SUITE/$ARCH on $1, sleeping 60m."
+	MESSAGE="${BUILD_URL}console.log hit diskspace issues with $SRCPACKAGE on $SUITE/$ARCH on $1, sleeping 60m."
 	echo "$MESSAGE"
 	echo "$MESSAGE" | mail -s "$JOB on $1 ran into diskspace problems" qa-jenkins-scm at lists.alioth.debian.org
 	echo "Sleeping 60m before aborting the job."
@@ -517,17 +517,17 @@ choose_package() {
 		xxxxxxx)
 			export DEBUG=true
 			set -x
-			irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
+			irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console.log"
 			;;
 		*)      ;;
 	esac
 	if [ "$NOTIFY" = "2" ] ; then
-		irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console"
+		irc_message debian-reproducible "$SRCPACKAGE/$SUITE/$ARCH started building at ${BUILD_URL}console.log"
 	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
 	log_info "starting to build ${SRCPACKAGE}/${SUITE}/${ARCH} on $(hostname -f) on '$DATE'"
-	log_info "The jenkins build log is/was available at ${BUILD_URL}console"
+	log_info "The jenkins build log is/was available at ${BUILD_URL}console.log"
 }
 
 download_source() {
@@ -815,7 +815,7 @@ check_installed_build_depends() {
 	RESULT=$?
 	set -e
 	if [ $RESULT -eq 1 ] ; then
-		printf "$(date -u) - $BUILDINFO in ${SUITE} on ${ARCH} varies, probably due to mirror updates. Doing the first build again, please check ${BUILD_URL}console for now...\n" >> /var/log/jenkins/reproducible-env-changes.log
+		printf "$(date -u) - $BUILDINFO in ${SUITE} on ${ARCH} varies, probably due to mirror updates. Doing the first build again, please check ${BUILD_URL}console.log for now...\n" >> /var/log/jenkins/reproducible-env-changes.log
 		echo
 		echo "============================================================================="
 		echo "$(date -u) - The installed build depends vary according to the two .buildinfo files, probably due to mirror updates. Doing the first build on $NODE1 again."
@@ -861,7 +861,7 @@ share_buildinfo() {
 		curl -s -X PUT --max-time 30 --data-binary @- "https://buildinfo.debian.net/api/submit" < ./${X}/$BUILDINFO_SIGNED > $TMPFILE || log_error "Could not submit buildinfo from ${X} to http://buildinfo.debian.net/api/submit"
 		cat $TMPFILE
 		if grep -q "500 Internal Server Error" $TMPFILE ; then
-			MESSAGE="$(date -u ) - ${BUILD_URL}console got error code 500 from buildinfo.debian.net for $(du -h ${X}/$BUILDINFO_SIGNED)"
+			MESSAGE="$(date -u ) - ${BUILD_URL}console.log got error code 500 from buildinfo.debian.net for $(du -h ${X}/$BUILDINFO_SIGNED)"
 			echo -e "$MESSAGE" | tee -a /var/log/jenkins/reproducible-submit2buildinfo.debian.net.log
 		fi
 		rm $TMPFILE
diff --git a/bin/reproducible_html_live_status.py b/bin/reproducible_html_live_status.py
index 6e56b9d..08fb5a1 100755
--- a/bin/reproducible_html_live_status.py
+++ b/bin/reproducible_html_live_status.py
@@ -155,7 +155,7 @@ def generate_live_status_table(arch):
         html += '<td><code>' + link_package(pkg, suite, arch) + '</code></td>'
         html += '<td>' + str(row[4]) + '</td><td>' + str(row[5]) + '</td>'
         html += '<td>' + convert_into_status_html(str(row[6])) + '</td><td>' + duration + '</td><td>' + avg_duration + '</td>'
-        html += '<td><a href="https://jenkins.debian.net/userContent/reproducible/debian/build_service/' + str(row[9]) + '/console">' + str(row[9]) + '</a></td>'
+        html += '<td><a href="https://jenkins.debian.net/userContent/reproducible/debian/build_service/' + str(row[9]) + '/console.log">' + str(row[9]) + '</a></td>'
         html += '</tr>\n'
     html += '</table></p>\n'
     return html
diff --git a/bin/reproducible_worker.sh b/bin/reproducible_worker.sh
index b92606b..84ca5de 100755
--- a/bin/reproducible_worker.sh
+++ b/bin/reproducible_worker.sh
@@ -60,5 +60,5 @@ while true ; do
 	#
 	# actually run reproducible_build.sh
 	#
-	/srv/jenkins/bin/reproducible_build.sh $NODE1 $NODE2 >$BUILD_BASE/$BUILD_ID/console 2>&1
+	/srv/jenkins/bin/reproducible_build.sh $NODE1 $NODE2 >$BUILD_BASE/$BUILD_ID/console.log 2>&1
 done

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

More information about the Qa-jenkins-scm mailing list