[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fixup 9929536, wrapping is tricky

[Holger Levsen]

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 36ce237b7feb8021e90bfe3732fc72b187f8196a
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Sep 9 16:00:49 2015 +0200

    reproducible: fixup 9929536, wrapping is tricky
---
 bin/jenkins_node_wrapper.sh    | 2 +-
 bin/reproducible_nodes_info.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index cc47736..b470669 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -66,7 +66,7 @@ elif [[ "$*" =~ rebootstrap_.* ]] ; then
 	export LC_ALL=C
 	exec $REBOOTSTRAPSH; croak "Exec failed";
 elif [ "$1" = "/srv/jenkins/bin/reproducible_info.sh" ] ; then
-	exec /srv/jenkins/bin/reproducible_info.sh "$2" ; croak "Exec failed";
+	exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed";
 elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
 	exec /srv/jenkins/bin/reproducible_build.sh "$2" "$3" "$4" "$5" ; croak "Exec failed";
 elif [[ "$*" =~ rsync\ --server\ --sender\ .*\ .\ /srv/reproducible-results/tmp.* ]] ; then
diff --git a/bin/reproducible_nodes_info.sh b/bin/reproducible_nodes_info.sh
index fbeeccb..8361731 100755
--- a/bin/reproducible_nodes_info.sh
+++ b/bin/reproducible_nodes_info.sh
@@ -19,8 +19,8 @@ for NODE in bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debia
 	# call jenkins_master_wrapper.sh so we only need to track different ssh ports in one place
 	# jenkins_master_wrapper.sh needs NODE_NAME and JOB_NAME
 	export NODE_NAME=$NODE
-	export JOB_NAME=reproducible_nodes_info
-	/srv/jenkins/bin/jenkins_master_wrapper.sh /srv/jenkins/bin/reproducible_info.sh > $TMPFILE_SRC
+	export JOB_NAME=/srv/jenkins/bin/reproducible_info.sh
+	/srv/jenkins/bin/jenkins_master_wrapper.sh > $TMPFILE_SRC
 	for KEY in ARCH NUM_CPU CPU_MODEL DATETIME ; do
 		VALUE=$(egrep "^$KEY=" $TMPFILE_SRC | cut -d "=" -f2-)
 		if [ ! -z "$VALUE" ] ; then
@@ -29,6 +29,7 @@ for NODE in bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debia
 	done
 	if [ -s $TMPFILE_NODE ] ; then
 		mv $TMPFILE_NODE $TARGET_DIR/$NODE
+		echo "$(date -u) - $TARGET_DIR/$NODE updated."
 	fi
 	rm -f $TMPFILE_SRC $TMPFILE_NODE
 done

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