diff options
| author | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 09:51:31 +0000 |
|---|---|---|
| committer | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 11:15:48 +0000 |
| commit | 1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (patch) | |
| tree | a9cbd2149e9b4b3d10f605367e3a96760972cde1 /tests.branching | |
| parent | 3d93d272079b602aefe5d3bcd660d4a3307f3aad (diff) | |
| download | morph-1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c.tar.gz | |
Dropped support for 'disk-size' from system morphology files'
Diffstat (limited to 'tests.branching')
| -rwxr-xr-x | tests.branching/tag-works-with-multiple-morphs-repos.script | 1 | ||||
| -rw-r--r-- | tests.branching/tag-works-with-multiple-morphs-repos.stdout | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script index 38d73852..cdb65b04 100755 --- a/tests.branching/tag-works-with-multiple-morphs-repos.script +++ b/tests.branching/tag-works-with-multiple-morphs-repos.script @@ -34,7 +34,6 @@ name: test-system kind: system system-kind: rootfs-tarball arch: $(uname -m) -disk-size: 1G strata: - morph: stratum1 ref: master diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout index 938e41ff..f570b2cd 100644 --- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout +++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout @@ -4,7 +4,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 create tag -commit 7253f9b1471f1983e07823d2b84582dde9fb108d +commit 8378526fced8e920e486a58d047efe664831aa40 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -67,11 +67,11 @@ index 0000000..610fae6 + repo: test:hello + unpetrify-ref: master diff --git a/test-system.morph b/test-system.morph -index 44d5ae5..08f9adc 100644 +index 2fad584..6aa58c2 100644 --- a/test-system.morph +++ b/test-system.morph -@@ -5,8 +5,11 @@ arch: x86_64 - disk-size: 1G +@@ -4,8 +4,11 @@ system-kind: rootfs-tarball + arch: x86_64 strata: - morph: stratum1 - ref: master @@ -85,7 +85,7 @@ index 44d5ae5..08f9adc 100644 + repo: test:morphs1 + unpetrify-ref: master + unpetrify-repo: test:morphs2 -commit 7253f9b1471f1983e07823d2b84582dde9fb108d +commit 8378526fced8e920e486a58d047efe664831aa40 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -156,11 +156,11 @@ index 0000000..610fae6 + repo: test:hello + unpetrify-ref: master diff --git a/test-system.morph b/test-system.morph -index 44d5ae5..08f9adc 100644 +index 2fad584..6aa58c2 100644 --- a/test-system.morph +++ b/test-system.morph -@@ -5,8 +5,11 @@ arch: x86_64 - disk-size: 1G +@@ -4,8 +4,11 @@ system-kind: rootfs-tarball + arch: x86_64 strata: - morph: stratum1 - ref: master |