summaryrefslogtreecommitdiff
path: root/mason
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-08-08 14:31:42 +0000
committerMichael Drake <michael.drake@codethink.co.uk>2014-08-08 14:31:42 +0000
commit23f071657d9775a26b6f4075ee81bad134019062 (patch)
tree93cf1c769b15638308a54946ca35a696e01e9b02 /mason
parentf8722850acc966ecbbf9704aa6913ecbb43c5501 (diff)
downloaddefinitions-23f071657d9775a26b6f4075ee81bad134019062.tar.gz
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.
Diffstat (limited to 'mason')
-rwxr-xr-xmason/mason-report.sh2
-rwxr-xr-xmason/mason.sh6
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"