diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-16 10:55:05 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-08-16 10:55:05 +0000 |
commit | 0a5ef89e107c22a5d1931838526fe3b22af42b95 (patch) | |
tree | a718c4093c41d50407893b6b485a2396c4eaf183 /tests.branching/setup | |
parent | 087fa4c8ea29d722e1cf5ab3a5509fc9c482796b (diff) | |
parent | e808380a723383f18cf5643b9b813e9f86520e9c (diff) | |
download | morph-0a5ef89e107c22a5d1931838526fe3b22af42b95.tar.gz |
Merge branch 'liw/refactor-edit-v2'
Reviewed-by: Richard Maw
Reviewed-by: Daniel Silverstone
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-x | tests.branching/setup | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/tests.branching/setup b/tests.branching/setup index 11fdf0f1..89fb392b 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -48,35 +48,24 @@ mkdir "$DATADIR/morphs" ln -s "$DATADIR/morphs" "$DATADIR/morphs.git" cat <<EOF > "$DATADIR/morphs/hello-system.morph" -{ - "name": "hello-system", - "kind": "system", - "system-kind": "rootfs-tarball", - "arch": "$(uname -m)", - "disk-size": "1G", - "strata": [ - { - "morph": "hello-stratum", - "repo": "test:morphs", - "ref": "master" - } - ] -} +arch: $(uname -m) +kind: system +name: hello-system +strata: +- morph: hello-stratum + ref: master + repo: test:morphs +system-kind: rootfs-tarball EOF cat <<EOF > "$DATADIR/morphs/hello-stratum.morph" -{ - "name": "hello-stratum", - "kind": "stratum", - "chunks": [ - { - "name": "hello", - "repo": "test:hello", - "ref": "master", - "build-depends": [] - } - ] -} +chunks: +- build-depends: [] + name: hello + ref: master + repo: test:hello +kind: stratum +name: hello-stratum EOF scripts/run-git-in "$DATADIR/morphs" init @@ -96,11 +85,9 @@ scripts/run-git-in "$DATADIR/morphs" checkout master mkdir "$DATADIR/hello" cat <<EOF > "$DATADIR/hello/hello.morph" -{ - "name": "hello", - "kind": "chunk", - "build-system": "dummy" -} +build-system: dummy +kind: chunk +name: hello EOF scripts/run-git-in "$DATADIR/hello" init |