From 2326d15967a29821eecd38d42aa82d1fe213562f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 12 Nov 2019 18:08:31 +0100 Subject: [PATCH] shrink job output boilerplate, remove redundancy and leave line-wrapper to the browser Signed-off-by: Holger Levsen --- bin/common-functions.sh | 14 ++++---------- bin/reproducible_openwrt.sh | 4 +--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/bin/common-functions.sh b/bin/common-functions.sh index 6d4e71df..1b876f20 100755 --- a/bin/common-functions.sh +++ b/bin/common-functions.sh @@ -91,20 +91,14 @@ if [ "${0:0:5}" != "/tmp/" ] ; then chmod +x $TTT echo "====================================================================================" echo - echo "$(date -u) - running $0 (for job $WHOAREWE) on $(hostname) now." + echo "$(date -u) - running $0 (for job $WHOAREWE) on $(hostname), called using \"$@\" as arguments." + echo "$(date -u) - actually running \"$(basename $0)\" (md5sum $(md5sum $0|cut -d ' ' -f1)) as \"$TTT\"" echo - echo "To learn to understand this, git clone https://salsa.debian.org/qa/jenkins.debian.net.git" - echo "and then have a look at the files README, INSTALL, CONTRIBUTING and maybe TODO." + echo "To learn to understand this, git clone https://salsa.debian.org/qa/jenkins.debian.net.git and then have a look at the files README, INSTALL, CONTRIBUTING and maybe TODO." echo - echo "This invocation of this script, which is located in bin/$(basename $0)," - echo "has been called using \"$@\" as arguments." - echo - echo "Please send feedback about jenkins to qa-jenkins-dev@lists.alioth.debian.org," - echo "or as a bug against the 'jenkins.debian.org' pseudo-package," - echo "feedback about specific job results should go to their respective lists and/or the BTS." + echo "Please send feedback about jenkins to qa-jenkins-dev@lists.alioth.debian.org, or as a bug against the 'jenkins.debian.org' pseudo-package, feedback about specific job results should go to their respective lists and/or the BTS." echo echo "====================================================================================" - echo "$(date -u) - start running \"$0\" (md5sum $(md5sum $0|cut -d ' ' -f1)) as \"$TTT\" on $(hostname)." echo # this is the "hack": call ourself as a copy in /tmp again $TTT "$@" diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh index 6cf61792..416890a2 100755 --- a/bin/reproducible_openwrt.sh +++ b/bin/reproducible_openwrt.sh @@ -450,8 +450,6 @@ build_two_times() { } - -echo "$0 got called with '$*'" # this script is called from positions # * it's called from the reproducible_wrapper when running on the master # * it's called from reproducible_opewnrt_common when doing remote builds @@ -467,7 +465,7 @@ case $1 in node_save_logs |\ node_cleanup_tmpdirs) # this is the allowed list echo "####" - echo "#### $1" + echo "#### $1 $@" echo "####" ;; *) -- GitLab