From 23f071657d9775a26b6f4075ee81bad134019062 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 8 Aug 2014 14:31:42 +0000 Subject: Use the local trove rather than upstream trove when polling for updates. This prevents discovering changes, and then being unable to build them because the local trove has not yet got them. --- mason/mason-report.sh | 2 +- mason/mason.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mason/mason-report.sh b/mason/mason-report.sh index 40ecbf62..0ef58315 100755 --- a/mason/mason-report.sh +++ b/mason/mason-report.sh @@ -209,7 +209,7 @@ if [ "$RESULT" = skip ]; then fi DURATION=$(( $(date +%s) - $(date --date="$START_TIME" +%s) )) -SHA1="$(cd "ws/$DEFINITIONS_REF/$UPSTREAM_TROVE_ADDRESS/baserock/baserock/definitions" && git rev-parse HEAD)" +SHA1="$(cd "ws/$DEFINITIONS_REF/$DISTBUILD_TROVE_ADDRESS/baserock/baserock/definitions" && git rev-parse HEAD)" update_report "$START_TIME" \ "$DISTBUILD_TROVE_ADDRESS" \ diff --git a/mason/mason.sh b/mason/mason.sh index 1fdcf2de..2dca7d84 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -11,9 +11,9 @@ if [ ! -e ws ]; then fi cd ws -definitions_repo="$DEFINITIONS_REF"/"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions +definitions_repo="$DEFINITIONS_REF"/"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions if [ ! -e "$definitions_repo" ]; then - morph checkout git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF" + morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF" cd "$definitions_repo" git config user.name "$TROVE_ID"-mason git config user.email "$TROVE_ID"-mason@$(hostname) @@ -41,7 +41,7 @@ rm -f "$HOME/success" echo INFO: Mason building: $DEFINITIONS_REF at $SHA1 "scripts/release-build" --no-default-configs \ - --trove-host "$UPSTREAM_TROVE_ADDRESS" \ + --trove-host "$DISTBUILD_TROVE_ADDRESS" \ --controllers "$DISTBUILD_ARCH:$DISTBUILD_CONTROLLER_ADDRESS" \ "$BUILD_CLUSTER_MORPHOLOGY" -- cgit v1.2.1 From e39619726e3fd1c8665eb8c7cf22bb1c7a12e315 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 8 Aug 2014 14:36:04 +0000 Subject: Reduce refresh rate of report from 10s to 1min. This reduces flicker/churn when browsing a mason report page. --- mason/mason-report.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mason/mason-report.sh b/mason/mason-report.sh index 0ef58315..a928f098 100755 --- a/mason/mason-report.sh +++ b/mason/mason-report.sh @@ -16,7 +16,7 @@ cat > $REPORT_PATH <<'EOF' - + @@ -148,7 +158,8 @@ code { @@ -183,8 +194,21 @@ update_report() { sed -i 's//\n'"$(sed_escape "$msg")"'/' $REPORT_PATH } +update_report_time() { + # Give function params sensible names + build_start_time="$1" + + # If the report file exists, update the last-checked-for-updates time + if [ -f $REPORT_PATH ]; then + sed -i 's/....-..-.. ..:..:..<\/code>/'"$(sed_escape "$build_start_time")"'<\/code>/' $REPORT_PATH + fi +} + START_TIME=`date +%Y-%m-%d\ %T` +update_report_time "$START_TIME" +cp "$REPORT_PATH" "$SERVER_PATH/index.html" + logfile="$(mktemp)" /root/mason.sh 2>&1 | tee "$logfile" case "${PIPESTATUS[0]}" in @@ -224,5 +248,5 @@ update_report "$START_TIME" \ # cp "$REPORT_PATH" "$SERVER_PATH/index.html" -mkdir /srv/mason/log -mv "$logfile" /srv/mason/log/"$SHA1--$START_TIME.log" +mkdir "$SERVER_PATH/log" +mv "$logfile" "$SERVER_PATH/log/$SHA1--$START_TIME.log" -- cgit v1.2.1