diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-08 14:31:42 +0000 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-08 14:31:42 +0000 |
| commit | 23f071657d9775a26b6f4075ee81bad134019062 (patch) | |
| tree | 93cf1c769b15638308a54946ca35a696e01e9b02 /mason/mason.sh | |
| parent | f8722850acc966ecbbf9704aa6913ecbb43c5501 (diff) | |
| download | definitions-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/mason.sh')
| -rwxr-xr-x | mason/mason.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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" |