diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-09 16:00:49 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-09 16:00:49 +0200 |
| commit | 36ce237b7feb8021e90bfe3732fc72b187f8196a (patch) | |
| tree | c4be5e44808ad6cee5fcdbaecbbe228075f4ab17 | |
| parent | 9929536a89a464c0c763aae189e33865a282885f (diff) | |
| download | jenkins.debian.net-36ce237b7feb8021e90bfe3732fc72b187f8196a.tar.xz | |
reproducible: fixup 9929536, wrapping is tricky
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 2 | ||||
| -rwxr-xr-x | 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 cc47736b..b4706697 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 fbeeccb5..8361731f 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 |