diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-13 15:13:50 +0000 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-13 15:13:50 +0000 |
| commit | 7f5bb948f70c3e6547d813b9e901cf28c2ce454d (patch) | |
| tree | 424414b4e20ad67556683f956bc0ef83c4c55bb1 /mason/mason.sh | |
| parent | e45b1e71ee60a8c5b1507b5eb7a0122cc47f3957 (diff) | |
| parent | d658a1b1e533269abfc7504eb5c4ae0278d7e5be (diff) | |
| download | definitions-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>
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" |