summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-02-12 13:23:19 +0000
committerBaserock Gerrit <gerrit@baserock.org>2016-02-15 12:47:00 +0000
commit02dc964dcbc75a36b5e1470c94ae7eec5cd8aabb (patch)
treebe2a953e5a7f0b014f43f734084c72ae7c4f50d2 /extensions
parent34eef236569b4efdabe70dc8e72ac39e924d17b5 (diff)
downloaddefinitions-02dc964dcbc75a36b5e1470c94ae7eec5cd8aabb.tar.gz
mason: Fix scripts to not use morph init/checkout
https://storyboard.baserock.org/#!/story/71 Change-Id: Iaed10e9edb66f92fd35d61601c06f496c2bea5f3
Diffstat (limited to 'extensions')
-rwxr-xr-xextensions/mason/mason.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/extensions/mason/mason.sh b/extensions/mason/mason.sh
index a548bc32..6f2a62b1 100755
--- a/extensions/mason/mason.sh
+++ b/extensions/mason/mason.sh
@@ -11,14 +11,9 @@ set -x
# Load our deployment config
. /etc/mason.conf
-if [ ! -e ws ]; then
- morph init ws
-fi
-cd ws
-
-definitions_repo="$DEFINITIONS_REF"/"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions
+definitions_repo=mason-definitions-"$DEFINITIONS_REF"
if [ ! -e "$definitions_repo" ]; then
- morph checkout git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF"
+ git clone -b "$DEFINITIONS_REF" git://"$UPSTREAM_TROVE_ADDRESS"/baserock/baserock/definitions "$definitions_repo"
cd "$definitions_repo"
git config user.name "$TROVE_ID"-mason
git config user.email "$TROVE_ID"-mason@$(hostname)