diff options
| -rw-r--r-- | scripts/setup-3rd-party-strata | 2 | ||||
| -rwxr-xr-x | tests.as-root/setup | 4 | ||||
| -rwxr-xr-x | tests.as-root/system-overlap.script | 2 | ||||
| -rw-r--r-- | tests.branching/edit-updates-stratum-build-depends.stdout | 2 | ||||
| -rw-r--r-- | tests.branching/edit-updates-stratum.stdout | 2 | ||||
| -rwxr-xr-x | tests.branching/setup | 2 | ||||
| -rw-r--r-- | tests.branching/tag-creates-commit-and-tag.stdout | 8 | ||||
| -rw-r--r-- | tests.branching/tag-tag-works-as-expected.stdout | 8 | ||||
| -rwxr-xr-x | tests.branching/tag-works-with-multiple-morphs-repos.script | 2 | ||||
| -rw-r--r-- | tests.branching/tag-works-with-multiple-morphs-repos.stdout | 8 | ||||
| -rw-r--r-- | tests.branching/workflow-petrify.stdout | 6 | ||||
| -rw-r--r-- | tests.merging/rename-stratum.stderr | 2 | ||||
| -rwxr-xr-x | tests.merging/setup | 2 | ||||
| -rwxr-xr-x | tests/setup | 2 |
14 files changed, 26 insertions, 26 deletions
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata index d1cc320d..f2ea2a4c 100644 --- a/scripts/setup-3rd-party-strata +++ b/scripts/setup-3rd-party-strata @@ -97,7 +97,7 @@ cat <<EOF > "hello-system.morph" { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "x86_64", "disk-size": "1G", "strata": [ diff --git a/tests.as-root/setup b/tests.as-root/setup index b9d5d477..eea9e061 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -134,7 +134,7 @@ git add tools-stratum.morph cat <<EOF > hello-system.morph name: hello-system kind: system -system-kind: syslinux-disk +system-kind: rootfs-tarball arch: `uname -m` disk-size: 1G strata: @@ -163,7 +163,7 @@ git add linux-stratum.morph cat <<EOF > linux-system.morph name: linux-system kind: system -system-kind: syslinux-disk +system-kind: rootfs-tarball arch: `uname -m` disk-size: 1G strata: diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index b8888491..6e6ef2ac 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -31,7 +31,7 @@ cat <<EOF >overlap-system.morph { "name": "overlap-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "disk-size": "1G", "strata": [ diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout b/tests.branching/edit-updates-stratum-build-depends.stdout index 00010f17..2e34da9a 100644 --- a/tests.branching/edit-updates-stratum-build-depends.stdout +++ b/tests.branching/edit-updates-stratum-build-depends.stdout @@ -12,7 +12,7 @@ index 3b7be17..febfa60 100644 } ] diff --git a/hello-system.morph b/hello-system.morph -index 87a47f0..75b0f90 100644 +index de2fd94..fe9cdc8 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,12 +8,12 @@ diff --git a/tests.branching/edit-updates-stratum.stdout b/tests.branching/edit-updates-stratum.stdout index 1e239196..e53588b4 100644 --- a/tests.branching/edit-updates-stratum.stdout +++ b/tests.branching/edit-updates-stratum.stdout @@ -12,7 +12,7 @@ index 3b7be17..febfa60 100644 } ] diff --git a/hello-system.morph b/hello-system.morph -index f3f64b4..99516e3 100644 +index 20e7b5b..a259572 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,7 +8,7 @@ diff --git a/tests.branching/setup b/tests.branching/setup index 1fa5b8e3..c18a5ac6 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "disk-size": "1G", "strata": [ diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout index 8c36ede3..95a5c34d 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 2f0a16ffe676335e6914f1c6117fc0cbe261eacf +commit e5c9758e3a30321ef2b49f09043e020d0c6f5da6 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -28,7 +28,7 @@ index 3b7be17..87561c1 100644 ] } diff --git a/hello-system.morph b/hello-system.morph -index f3f64b4..d26675d 100644 +index 20e7b5b..388dbcf 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,7 +8,8 @@ @@ -42,7 +42,7 @@ index f3f64b4..d26675d 100644 ] } test:morphs -commit 2f0a16ffe676335e6914f1c6117fc0cbe261eacf +commit e5c9758e3a30321ef2b49f09043e020d0c6f5da6 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -50,7 +50,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Message -commit 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 +commit 9d4b0981d6a2118cbd3d045cc1704b224d38296f Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout index ec12ba66..4848ee6e 100644 --- a/tests.branching/tag-tag-works-as-expected.stdout +++ b/tests.branching/tag-tag-works-as-expected.stdout @@ -8,7 +8,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000 Second -commit a96154002b3ffe71bd120e38682edbbe40b8453b +commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -31,7 +31,7 @@ index 3b7be17..87561c1 100644 ] } diff --git a/hello-system.morph b/hello-system.morph -index f3f64b4..2981e9b 100644 +index 20e7b5b..f1dc834 100644 --- a/hello-system.morph +++ b/hello-system.morph @@ -8,7 +8,8 @@ @@ -45,7 +45,7 @@ index f3f64b4..2981e9b 100644 ] } test:morphs -commit a96154002b3ffe71bd120e38682edbbe40b8453b +commit fec3744adf30c1014775dce1668b1b0a0e2b1dcf Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -53,7 +53,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 Second -commit 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 +commit 9d4b0981d6a2118cbd3d045cc1704b224d38296f Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script index 94cd01dc..5259b4c1 100755 --- a/tests.branching/tag-works-with-multiple-morphs-repos.script +++ b/tests.branching/tag-works-with-multiple-morphs-repos.script @@ -36,7 +36,7 @@ cat <<EOF > "$DATADIR/repos/morphs1/test-system.morph" { "name": "test-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "disk-size": "1G", "strata": [ diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout index da49dfe1..192aca56 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 ddcf257bd01b46424dc570e72aa8946b6dfdbc5f +commit f629bea191ba12b1d85e5b41e1adc6d1c73715c9 Author: developer <developer@example.com> Date: Tue Jul 31 16:51:54 2012 +0000 @@ -57,7 +57,7 @@ index 0000000..a735127 + "kind": "stratum" +} diff --git a/test-system.morph b/test-system.morph -index 27806c1..c5e4d98 100644 +index 340fbb9..aec2397 100644 --- a/test-system.morph +++ b/test-system.morph @@ -8,12 +8,15 @@ @@ -79,7 +79,7 @@ index 27806c1..c5e4d98 100644 } ] } -commit ddcf257bd01b46424dc570e72aa8946b6dfdbc5f +commit f629bea191ba12b1d85e5b41e1adc6d1c73715c9 Author: developer <developer@example.com> AuthorDate: Tue Jul 31 16:51:54 2012 +0000 Commit: developer <developer@example.com> @@ -140,7 +140,7 @@ index 0000000..a735127 + "kind": "stratum" +} diff --git a/test-system.morph b/test-system.morph -index 27806c1..c5e4d98 100644 +index 340fbb9..aec2397 100644 --- a/test-system.morph +++ b/test-system.morph @@ -8,12 +8,15 @@ diff --git a/tests.branching/workflow-petrify.stdout b/tests.branching/workflow-petrify.stdout index c86afa2e..9f0cfb0c 100644 --- a/tests.branching/workflow-petrify.stdout +++ b/tests.branching/workflow-petrify.stdout @@ -2,7 +2,7 @@ test/petrify after petrifying: { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "x86_64", "disk-size": "1G", "strata": [ @@ -56,7 +56,7 @@ test/petrify after editing a chunk: { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "x86_64", "disk-size": "1G", "strata": [ @@ -109,7 +109,7 @@ test/unpetrify after unpetrifying: { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "x86_64", "disk-size": "1G", "strata": [ diff --git a/tests.merging/rename-stratum.stderr b/tests.merging/rename-stratum.stderr index 760501fc..8ffed439 100644 --- a/tests.merging/rename-stratum.stderr +++ b/tests.merging/rename-stratum.stderr @@ -1 +1 @@ -ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 48d38ef3f39857d7dba4ed1ffc51653c6bed4906 +ERROR: goodbye-stratum.morph was not found in TMP/workspace/master/test:morphs at ref 9d4b0981d6a2118cbd3d045cc1704b224d38296f diff --git a/tests.merging/setup b/tests.merging/setup index 1fa5b8e3..c18a5ac6 100755 --- a/tests.merging/setup +++ b/tests.merging/setup @@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph" { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "disk-size": "1G", "strata": [ diff --git a/tests/setup b/tests/setup index 50fd5bd4..b6d220f5 100755 --- a/tests/setup +++ b/tests/setup @@ -106,7 +106,7 @@ cat <<EOF > hello-system.morph { "name": "hello-system", "kind": "system", - "system-kind": "syslinux-disk", + "system-kind": "rootfs-tarball", "disk-size": "1G", "strata": [ { |