summaryrefslogtreecommitdiff
path: root/tests.deploy/setup
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-02-14 10:22:46 +0000
commit8f8fc96b884e7f175d4a01bc2d91452d7149bf33 (patch)
treed0d19252c154fb030f7dfa1c4784ef60e45bc40e /tests.deploy/setup
parent2decdcdd27567e99e3bc53347d34064ab34f7932 (diff)
parentfbf70e2e5595d0cc7edaf7240a732cc5d2632c34 (diff)
downloadmorph-8f8fc96b884e7f175d4a01bc2d91452d7149bf33.tar.gz
Merge branch 'baserock/richardmaw/S10310/invalid-repo-ref-v2'
Reviewed-by: Sam Thursfield
Diffstat (limited to 'tests.deploy/setup')
-rwxr-xr-xtests.deploy/setup10
1 files changed, 1 insertions, 9 deletions
diff --git a/tests.deploy/setup b/tests.deploy/setup
index 5f83747e..5fbe0262 100755
--- a/tests.deploy/setup
+++ b/tests.deploy/setup
@@ -10,7 +10,7 @@
# The stratum repository contains a single branch, "master", with a
# stratum and a system morphology that include the chunk above.
#
-# Copyright (C) 2011, 2012, 2013 Codethink Limited
+# Copyright (C) 2011, 2012, 2013, 2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -116,8 +116,6 @@ cat <<EOF > hello-system.morph
"strata": [
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "master"
}
]
}
@@ -131,8 +129,6 @@ cat <<EOF > linux-stratum.morph
"build-depends": [
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "master"
}
],
"chunks": [
@@ -156,13 +152,9 @@ cat <<EOF > linux-system.morph
"strata": [
{
"morph": "hello-stratum",
- "repo": "test:morphs",
- "ref": "master"
},
{
"morph": "linux-stratum",
- "repo": "test:morphs",
- "ref": "master"
}
],
"configuration-extensions": [