The branch master has been updated
via 9d9fdc1727e3ff90d25dbccb4c530312b897536f (commit)
via 7723f7c116e2024e727648fe369133b0fc8f70e5 (commit)
from da7d7b372dc15d739df3ba7aff2c1a4292148515 (commit)
- Log -----------------------------------------------------------------
commit 9d9fdc1727e3ff90d25dbccb4c530312b897536f
Author: Richard Levitte <[email protected]>
Date: Thu Feb 8 19:39:21 2018 +0100
run-checker-autohooks: make some variables mandatory
REPORT_FROM and REPORT_RECIPIENT *must* be assigned something to
be useful. The defaults are removed, as they are internal for the
OpenSSL Team machinery
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/9)
commit 7723f7c116e2024e727648fe369133b0fc8f70e5
Author: Richard Levitte <[email protected]>
Date: Thu Feb 8 19:37:59 2018 +0100
run-checker-autohooks: update README for accuracy
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/9)
-----------------------------------------------------------------------
Summary of changes:
run-checker/run-checker-autohooks/README | 14 ++++----
run-checker/run-checker-autohooks/hook-end | 56 ++++++++++++++++--------------
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/run-checker/run-checker-autohooks/README
b/run-checker/run-checker-autohooks/README
index a4039b7..87e4be4 100644
--- a/run-checker/run-checker-autohooks/README
+++ b/run-checker/run-checker-autohooks/README
@@ -9,11 +9,11 @@ repeatedly, for example as a cron job.
Example setup:
- $ git clone [email protected]:bureau.git bureau
+ $ git clone git://git.openssl.org/tools.git tools
$ mkdir ~/run-checker
$ cd ~/run-checker
- $ ln -s ../bureau/run-checker.sh \
- ../bureau/run-checker-autohooks/hook-{prepare,start,end,takedown} \
+ $ ln -s ../tools/run-checker/run-checker.sh \
+
../tools/run-checker/run-checker-autohooks/hook-{prepare,start,end,takedown} \
.
$ git clone [email protected]:openssl.git openssl
@@ -30,13 +30,13 @@ In addition to the hooks, one can also have a shell script
called
- REPORT_FROM
- The email address used in the report From: header. Defaults to
- 'OpenSSL run-checker <[email protected]>'
+ The email address used in the report From: header. This MUST be
+ assigned a value or reports will not be posted.
- REPORT_RECIPIENT
- The email address reports will get sent to. Defaults to
- '<[email protected]>'
+ The email address reports will get sent to. This MUST be assigned a
+ value or reports will not be posted.
- SKIP_OPTS
diff --git a/run-checker/run-checker-autohooks/hook-end
b/run-checker/run-checker-autohooks/hook-end
index 70c51b9..c95051b 100755
--- a/run-checker/run-checker-autohooks/hook-end
+++ b/run-checker/run-checker-autohooks/hook-end
@@ -3,8 +3,8 @@
here=$(cd $(dirname $0); pwd)
rcd=$here/.run-checker-data
-REPORT_RECIPIENT='<[email protected]>'
-REPORT_FROM='OpenSSL run-checker <[email protected]>'
+REPORT_RECIPIENT=
+REPORT_FROM=
if [ -f $rcd/new/hook-config ]; then
. $rcd/new/hook-config
fi
@@ -38,47 +38,49 @@ if (
# If the build failed or the status changed since last time, report
if [ "$newstatus" == "fail" -o "$newstatus" != "$curstatus" ]; then
- (
- statusword=FAILED
- if [ "$newstatus" == "pass" ]; then
- statusword=SUCCESSFUL
- elif [ "$curstatus" == "fail" ]; then
- statusword="Still FAILED"
- fi
- echo "From: $REPORT_FROM"
- echo "To: $REPORT_RECIPIENT"
- echo "Subject: $statusword build of OpenSSL branch $gitbranch with
options $expandedopts"
- cat <<EOF
+ if [ -n "$REPORT_FROM" -a -n "$REPORT_RECIPIENT" ]; then
+ (
+ statusword=FAILED
+ if [ "$newstatus" == "pass" ]; then
+ statusword=SUCCESSFUL
+ elif [ "$curstatus" == "fail" ]; then
+ statusword="Still FAILED"
+ fi
+ echo "From: $REPORT_FROM"
+ echo "To: $REPORT_RECIPIENT"
+ echo "Subject: $statusword build of OpenSSL branch $gitbranch
with options $expandedopts"
+ cat <<EOF
Platform and configuration command:
EOF
- echo "\$ uname -a"
- uname -a
- head -1 "$newoptdir/build.log"
- if [ -f $rcd/new/rc-force-build ]; then
- cat <<EOF
+ echo "\$ uname -a"
+ uname -a
+ head -1 "$newoptdir/build.log"
+ if [ -f $rcd/new/rc-force-build ]; then
+ cat <<EOF
Forced build, latest commit is:
EOF
- else
- cat <<EOF
+ else
+ cat <<EOF
Commit log since last time:
EOF
- fi
- cat "$newoptdir/log"
- if [ "$newstatus" == "fail" ]; then
- cat <<EOF
+ fi
+ cat "$newoptdir/log"
+ if [ "$newstatus" == "fail" ]; then
+ cat <<EOF
Build log ended with (last 100 lines):
EOF
- tail -100 "$newoptdir/build.log"
- fi
- ) | /usr/lib/sendmail -it
+ tail -100 "$newoptdir/build.log"
+ fi
+ ) | /usr/lib/sendmail -it
+ fi
fi
if [ -d "$curoptdir" ]; then
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
