summaryrefslogtreecommitdiff
path: root/tests.branching/setup
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-11-12 13:57:59 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-11-12 13:57:59 +0000
commit19b16a2cc6d67871d0a4298354eb446ada136a8e (patch)
tree01361b4995f97e26dfa6db56c685bc51a7f8b122 /tests.branching/setup
parent6eca890690217136a9685ca9ac55f6ea59882e9c (diff)
parenteeb6c8bde8112dd760853a0f35d6d0d7d9676fa7 (diff)
downloadmorph-19b16a2cc6d67871d0a4298354eb446ada136a8e.tar.gz
Merge branch 'samthursfield/test-tidying' of git://git.baserock.org/baserock/morph
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-xtests.branching/setup6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests.branching/setup b/tests.branching/setup
index f075e7b1..c0dfd969 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -29,7 +29,7 @@ source "$SRCDIR/scripts/fix-committer-info"
# Create a morph configuration file
cat <<EOF > "$DATADIR/morph.conf"
[config]
-repo-alias = baserock=file://$DATADIR/%s#file://$DATADIR/%s
+repo-alias = test=file://$DATADIR/%s#file://$DATADIR/%s
cachedir = $DATADIR/workspace/.morph/cache
log = $DATADIR/morph.log
keep-path = true
@@ -58,7 +58,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
"strata": [
{
"morph": "hello-stratum",
- "repo": "baserock:morphs",
+ "repo": "test:morphs",
"ref": "master"
}
]
@@ -72,7 +72,7 @@ cat <<EOF > "$DATADIR/morphs/hello-stratum.morph"
"chunks": [
{
"name": "hello",
- "repo": "baserock:hello",
+ "repo": "test:hello",
"ref": "master",
"build-depends": []
}