diff options
Diffstat (limited to 'mason')
-rwxr-xr-x | mason/mason-report.sh | 2 | ||||
-rwxr-xr-x | 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" |