summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-08-13 15:13:50 +0000
committerMichael Drake <michael.drake@codethink.co.uk>2014-08-13 15:13:50 +0000
commit7f5bb948f70c3e6547d813b9e901cf28c2ce454d (patch)
tree424414b4e20ad67556683f956bc0ef83c4c55bb1
parente45b1e71ee60a8c5b1507b5eb7a0122cc47f3957 (diff)
parentd658a1b1e533269abfc7504eb5c4ae0278d7e5be (diff)
downloaddefinitions-7f5bb948f70c3e6547d813b9e901cf28c2ce454d.tar.gz
Merge branch 'baserock/michaeldrake/mason-devel'
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk> Reviewed-by: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
-rwxr-xr-xmason/mason-report.sh36
-rwxr-xr-xmason/mason.sh6
2 files changed, 33 insertions, 9 deletions
diff --git a/mason/mason-report.sh b/mason/mason-report.sh
index 40ecbf62..c18e68ac 100755
--- a/mason/mason-report.sh
+++ b/mason/mason-report.sh
@@ -16,7 +16,7 @@ cat > $REPORT_PATH <<'EOF'
<html>
<head>
<meta charset="UTF-8">
-<meta http-equiv="refresh" content="10">
+<meta http-equiv="refresh" content="60">
<style>
html, body {
margin: 0;
@@ -127,10 +127,20 @@ code {
border-top: #888 1px solid;
font-size: 80%;
padding: 0;
- text-align: right;
position: fixed;
bottom: 0;
width: 100%;
+ display: table;
+}
+#footer p {
+ padding: 1.3em;
+ display: table-cell;
+}
+#footer p code {
+ font-size: 110%;
+}
+#footer p.about {
+ text-align: right;
}
</style>
</head>
@@ -148,7 +158,8 @@ code {
<!--INSERTION POINT-->
</table>
<div id="footer">
-<p>Generated by Mason</p>
+<p>Last checked for updates at: <code>....-..-.. ..:..:..</code></p>
+<p class="about">Generated by Mason | Powered by Baserock</p>
</div>
</body>
</html>
@@ -183,8 +194,21 @@ update_report() {
sed -i 's/<!--INSERTION POINT-->/<!--INSERTION POINT-->\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>....-..-.. ..:..:..<\/code>/<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
@@ -209,7 +233,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" \
@@ -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"
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"