summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-10 19:33:00 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-10 19:33:00 +0200
commitc67f36360893df78871cc50a42cb9a6a24ca5e3f (patch)
tree0dc42152b0d4cd8593d8379543b6bc9785098c94
parentf2404e45c1f5257e244fc11c657816a970bee539 (diff)
downloadjenkins.debian.net-c67f36360893df78871cc50a42cb9a6a24ca5e3f.tar.xz
reproducible: improve output
-rwxr-xr-xbin/reproducible_build.sh14
1 files changed, 8 insertions, 6 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 2b5207d3..32ef5016 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -465,6 +465,8 @@ check_suitability() {
first_build() {
echo "============================================================================="
echo "Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname -f) now."
+ echo "Date: $(date)"
+ echo "Date UTC: $(date -u)"
echo "============================================================================="
set -x
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
@@ -489,6 +491,11 @@ EOF
}
second_build() {
+ echo "============================================================================="
+ echo "Re-Building ${SRCPACKAGE} in ${SUITE} on ${ARCH} on $(hostname -f) now."
+ echo "Date: $(date)"
+ echo "Date UTC: $(date -u)"
+ echo "============================================================================="
set -x
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
@@ -566,9 +573,7 @@ check_buildinfo() {
printf "$(date -u) - $BUILDINFO in ${SUITE} on ${ARCH} varies, probably due to mirror update. Doing the first build again, please check ${BUILD_URL}console for now..." >> /var/log/jenkins/reproducible-hit-mirror-update.log
echo
echo "============================================================================="
- echo ".buildinfo's Build-Environment varies, probably due to mirror update."
- echo "Doing the first build again."
- echo "Building ${SRCPACKAGE}/${VERSION} in ${SUITE} on ${ARCH} on $(hostname -f) now."
+ echo "$(date -u) - The build environment varies according to the two .buildinfo files, probably due to mirror update. Doing the first build again."
echo "============================================================================="
echo
if [ "$MODE" = "legacy" ] ; then
@@ -605,9 +610,6 @@ build_rebuild() {
elif [ -f b1/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes ] ; then
# the first build did not FTBFS, try rebuild it.
check_for_race_conditions
- echo "============================================================================="
- echo "Re-building ${SRCPACKAGE}/${VERSION} in ${SUITE} on ${ARCH} $(hostname -f) now."
- echo "============================================================================="
if [ "$MODE" = "legacy" ] ; then
second_build
else