From 1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c Mon Sep 17 00:00:00 2001 From: Dan Firth Date: Fri, 27 Sep 2013 09:51:31 +0000 Subject: Dropped support for 'disk-size' from system morphology files' --- .../tag-works-with-multiple-morphs-repos.script | 1 - .../tag-works-with-multiple-morphs-repos.stdout | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'tests.branching') 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 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 AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -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 -- cgit v1.2.1 From 5e0ad6ad29fa776088241828580d58b7d91e9fd1 Mon Sep 17 00:00:00 2001 From: Dan Firth Date: Fri, 27 Sep 2013 11:16:56 +0000 Subject: Dropped support for 'system-kind' from system morphology files --- .../edit-updates-stratum-build-depends.stdout | 28 ++-------------------- tests.branching/edit-updates-stratum.stdout | 5 ++-- tests.branching/setup | 1 - tests.branching/tag-creates-commit-and-tag.stdout | 11 ++++----- tests.branching/tag-tag-works-as-expected.stdout | 11 ++++----- .../tag-works-with-multiple-morphs-repos.script | 1 - .../tag-works-with-multiple-morphs-repos.stdout | 12 +++++----- 7 files changed, 20 insertions(+), 49 deletions(-) (limited to 'tests.branching') diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout index 1c6eb8e3..7120ef50 100644 --- a/tests.branching/edit-updates-stratum-build-depends.stdout +++ b/tests.branching/edit-updates-stratum-build-depends.stdout @@ -13,10 +13,10 @@ index 73ed482..475fe0f 100644 kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index 721473c..1537f53 100644 +index 3f7b4d3..199c924 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,9 +3,9 @@ kind: system +@@ -3,5 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum @@ -24,27 +24,3 @@ index 721473c..1537f53 100644 + ref: newbranch repo: test:morphs + unpetrify-ref: master - - morph: xyzzy-stratum - ref: master - repo: test:morphs --system-kind: rootfs-tarball -diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph -index e302037..bcf5b57 100644 ---- a/xyzzy-stratum.morph -+++ b/xyzzy-stratum.morph -@@ -1,11 +1,13 @@ - build-depends: - - morph: hello-stratum -- ref: master -+ ref: newbranch - repo: test:morphs -+ unpetrify-ref: master - chunks: - - build-depends: [] - name: hello -- ref: master -+ ref: newbranch - repo: test:hello -+ unpetrify-ref: master - kind: stratum - name: xyzzy-stratum diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 32eb820d..7120ef50 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -13,15 +13,14 @@ index 73ed482..475fe0f 100644 kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index b0fed3b..199c924 100644 +index 3f7b4d3..199c924 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,6 +3,6 @@ kind: system +@@ -3,5 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum - ref: master + ref: newbranch repo: test:morphs --system-kind: rootfs-tarball + unpetrify-ref: master diff --git a/tests.branching/setup b/tests.branching/setup index 589f19ed..1263e3b6 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -55,7 +55,6 @@ strata: - morph: hello-stratum ref: master repo: test:morphs -system-kind: rootfs-tarball EOF cat < "$DATADIR/morphs/hello-stratum.morph" diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index 598e28bf..b6098eb5 100644 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ b/tests.branching/tag-creates-commit-and-tag.stdout @@ -5,7 +5,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Message -commit 9509c9c379f8ba643b2ad9a6ec50ecf96993cbb5 +commit 6895ed63425bedb3dccaea3f258c705b1600f6be Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -26,10 +26,10 @@ index 73ed482..2218f63 100644 kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index b0fed3b..4c4ee3e 100644 +index 3f7b4d3..d909347 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,6 +3,7 @@ kind: system +@@ -3,5 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum @@ -37,10 +37,9 @@ index b0fed3b..4c4ee3e 100644 + ref: example-tag repo: test:morphs + unpetrify-ref: master - system-kind: rootfs-tarball test:morphs -commit 9509c9c379f8ba643b2ad9a6ec50ecf96993cbb5 +commit 6895ed63425bedb3dccaea3f258c705b1600f6be Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -48,7 +47,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit 1fe013ee284724848d65096d4d88f612fae56fc6 +commit e11a36aa9e4c998c41a3ec3209324b9318e484ae Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index 242b2d4e..98a3be81 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -9,7 +9,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit ca7594f436da55bda2cfff2c6484d11aa0ea4cbc +commit 476e4ff4b19c38eb64ad3a151b7c58a7ab95c9ee Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -30,10 +30,10 @@ index 73ed482..2218f63 100644 kind: stratum name: hello-stratum diff --git a/hello-system.morph b/hello-system.morph -index b0fed3b..875d73a 100644 +index 3f7b4d3..431e15d 100644 --- a/hello-system.morph +++ b/hello-system.morph -@@ -3,6 +3,7 @@ kind: system +@@ -3,5 +3,6 @@ kind: system name: hello-system strata: - morph: hello-stratum @@ -41,10 +41,9 @@ index b0fed3b..875d73a 100644 + ref: tagged-tag repo: test:morphs + unpetrify-ref: master - system-kind: rootfs-tarball test:morphs -commit ca7594f436da55bda2cfff2c6484d11aa0ea4cbc +commit 476e4ff4b19c38eb64ad3a151b7c58a7ab95c9ee Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -52,7 +51,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second -commit 1fe013ee284724848d65096d4d88f612fae56fc6 +commit e11a36aa9e4c998c41a3ec3209324b9318e484ae Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script index cdb65b04..f6ecbf32 100755 --- a/tests.branching/tag-works-with-multiple-morphs-repos.script +++ b/tests.branching/tag-works-with-multiple-morphs-repos.script @@ -32,7 +32,6 @@ mkdir "$DATADIR/morphs1" cat < "$DATADIR/morphs1/test-system.morph" name: test-system kind: system -system-kind: rootfs-tarball arch: $(uname -m) strata: - morph: stratum1 diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout index f570b2cd..ac2018e9 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 8378526fced8e920e486a58d047efe664831aa40 +commit 7323ed5dcc47715e7303fd36d537aef98a04df9a Author: developer Date: Tue Jul 31 16:51:54 2012 +0000 @@ -67,10 +67,10 @@ index 0000000..610fae6 + repo: test:hello + unpetrify-ref: master diff --git a/test-system.morph b/test-system.morph -index 2fad584..6aa58c2 100644 +index 62d3b08..edb5745 100644 --- a/test-system.morph +++ b/test-system.morph -@@ -4,8 +4,11 @@ system-kind: rootfs-tarball +@@ -3,8 +3,11 @@ kind: system arch: x86_64 strata: - morph: stratum1 @@ -85,7 +85,7 @@ index 2fad584..6aa58c2 100644 + repo: test:morphs1 + unpetrify-ref: master + unpetrify-repo: test:morphs2 -commit 8378526fced8e920e486a58d047efe664831aa40 +commit 7323ed5dcc47715e7303fd36d537aef98a04df9a Author: developer AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer @@ -156,10 +156,10 @@ index 0000000..610fae6 + repo: test:hello + unpetrify-ref: master diff --git a/test-system.morph b/test-system.morph -index 2fad584..6aa58c2 100644 +index 62d3b08..edb5745 100644 --- a/test-system.morph +++ b/test-system.morph -@@ -4,8 +4,11 @@ system-kind: rootfs-tarball +@@ -3,8 +3,11 @@ kind: system arch: x86_64 strata: - morph: stratum1 -- cgit v1.2.1