From 4f15d62cddede0765db5062d048288806f17939e Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Aug 08 2017 06:54:27 +0000 Subject: Define start fedmsg json value The nightly scripts try to send an announcement about compose starting. As this happens before Pungi even started, the compose ID is not known and can not be included in the message. The message about starting rsync sent later will contain the ID correctly. Without the json defined there is a traceback in the cron output, but the errors are not logged anywhere else (but don't actually block anything in the compose process). Relates: https://pagure.io/pungi/issue/698 Signed-off-by: Lubomír Sedlář --- diff --git a/nightly-modular.sh b/nightly-modular.sh index 957170e..496bde6 100755 --- a/nightly-modular.sh +++ b/nightly-modular.sh @@ -40,6 +40,7 @@ FEDMSG_CERTPREFIX="releng" . ./releng/scripts/fedmsg-functions.sh # Announce that we are starting, even though we don't know the compose_id yet.. +fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH") send_fedmsg "${fedmsg_json_start}" ${DIST} start CMD="pungi-koji --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES" diff --git a/nightly.sh b/nightly.sh index d585c24..e976a65 100755 --- a/nightly.sh +++ b/nightly.sh @@ -42,6 +42,7 @@ FEDMSG_CERTPREFIX="releng" . ./releng/scripts/fedmsg-functions.sh # Announce that we are starting, even though we don't know the compose_id yet.. +fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s"}' "$BRANCHED" "$ARCH") send_fedmsg "${fedmsg_json_start}" ${DIST} start pushd $TMPDIR