diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
| commit | c1c331e7c545c7a2f0545d3b1ef9751c9571d357 (patch) | |
| tree | d2a4edf71f2c7204808e4543f3d743a81e95a1bd /tests.as-root/metadata-includes-repo-alias.setup | |
| parent | b2786c73c0f4d4b76f824e309598ce57065e30ab (diff) | |
| parent | 5f705f1e2c95b988ae39df7820f4034c49f375e4 (diff) | |
| download | morph-c1c331e7c545c7a2f0545d3b1ef9751c9571d357.tar.gz | |
Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'
Reviewed-by:
Richard Maw
Diffstat (limited to 'tests.as-root/metadata-includes-repo-alias.setup')
| -rwxr-xr-x | tests.as-root/metadata-includes-repo-alias.setup | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup index d7fc96e3..e4557302 100755 --- a/tests.as-root/metadata-includes-repo-alias.setup +++ b/tests.as-root/metadata-includes-repo-alias.setup @@ -24,19 +24,12 @@ morphsrepo="$DATADIR/morphs" cd "$morphsrepo" git checkout -b tarball cat <<EOF > hello-tarball.morph -{ - "name": "hello-tarball", - "kind": "system", - "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)", - "strata": [ - { - "morph": "hello-stratum", - }, - { - "morph": "linux-stratum", - } - ] -} +name: hello-tarball +kind: system +arch: $("$SRCDIR/scripts/test-morph" print-architecture) +strata: + - morph: hello-stratum + - morph: linux-stratum EOF git add hello-tarball.morph |