diff options
| author | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 11:16:56 +0000 |
|---|---|---|
| committer | Dan Firth <dan.firth@codethink.co.uk> | 2013-09-27 11:16:56 +0000 |
| commit | 5e0ad6ad29fa776088241828580d58b7d91e9fd1 (patch) | |
| tree | ca7bd78b3fc6f484ddb8407fb444d991617d9b39 /tests.as-root | |
| parent | 1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (diff) | |
| download | morph-5e0ad6ad29fa776088241828580d58b7d91e9fd1.tar.gz | |
Dropped support for 'system-kind' from system morphology files
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/metadata-includes-morph-version.setup | 1 | ||||
| -rwxr-xr-x | tests.as-root/metadata-includes-repo-alias.setup | 1 | ||||
| -rwxr-xr-x | tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 3 | ||||
| -rwxr-xr-x | tests.as-root/setup | 2 | ||||
| -rwxr-xr-x | tests.as-root/system-overlap.script | 1 | ||||
| -rwxr-xr-x | tests.as-root/tarball-image-is-sensible.setup | 1 |
6 files changed, 0 insertions, 9 deletions
diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup index 2284cfb9..f0aefb3c 100755 --- a/tests.as-root/metadata-includes-morph-version.setup +++ b/tests.as-root/metadata-includes-morph-version.setup @@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph { "name": "hello-tarball", "kind": "system", - "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "strata": [ { diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup index 2284cfb9..f0aefb3c 100755 --- a/tests.as-root/metadata-includes-repo-alias.setup +++ b/tests.as-root/metadata-includes-repo-alias.setup @@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph { "name": "hello-tarball", "kind": "system", - "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "strata": [ { diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script index 8229127d..93cd135f 100755 --- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script +++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script @@ -16,9 +16,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -## A system-kind of rootfs-tarball should build both kernel image and -## a tarball with the root filesystem. - set -eu # Disable test on versions of Python before 2.7. diff --git a/tests.as-root/setup b/tests.as-root/setup index 2c5e09ca..2ab1cd94 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -134,7 +134,6 @@ git add tools-stratum.morph cat <<EOF > hello-system.morph name: hello-system kind: system -system-kind: rootfs-tarball arch: `uname -m` strata: - morph: hello-stratum @@ -162,7 +161,6 @@ git add linux-stratum.morph cat <<EOF > linux-system.morph name: linux-system kind: system -system-kind: rootfs-tarball arch: `uname -m` strata: - morph: hello-stratum diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 5df9374b..41ff7536 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -31,7 +31,6 @@ cat <<EOF >overlap-system.morph { "name": "overlap-system", "kind": "system", - "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "strata": [ { diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup index fa904c2c..5fd7b283 100755 --- a/tests.as-root/tarball-image-is-sensible.setup +++ b/tests.as-root/tarball-image-is-sensible.setup @@ -46,7 +46,6 @@ cat <<EOF > hello-tarball.morph { "name": "hello-tarball", "kind": "system", - "system-kind": "rootfs-tarball", "arch": "$(uname -m)", "strata": [ { |