1 files changed, 8 insertions, 64 deletions
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script
index 3c1b903c..c11c246f 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -23,77 +23,21 @@ set -eu
 . "$SRCDIR/tests.as-root/lib"
 
 cache="$DATADIR/cache/artifacts"
-kernelrepo="$DATADIR/kernel-repo"
-morphsrepo="$DATADIR/morphs"
 
-arch=$(uname -m)
-
-cd "$morphsrepo"
-git checkout --quiet -b custom master
-cat <<EOF >system.morph
-{
-  "name": "system",
-  "kind": "system",
-  "system-kind": "disk",
-  "arch": "$arch",
-  "disk-size": "1G",
-  "strata": [
-    {
-      "morph": "stratum",
-      "repo": "test:morphs",
-      "ref": "custom"
-    }
-  ]
-}
-EOF
-cat <<EOF >stratum.morph
-{
-  "name": "stratum",
-  "kind": "stratum",
-  "chunks": [
-    {
-      "name": "hello",
-      "repo": "test:chunk-repo",
-      "ref": "farrokh",
-      "build-depends": []
-    },
-    {
-      "name": "linux",
-      "repo": "test:kernel-repo",
-      "ref": "custom",
-      "build-depends": ["hello"]
-    }
-  ]
-}
-EOF
-git add system.morph stratum.morph
-git commit --quiet -m "foo"
-
-cd "$kernelrepo"
-git checkout --quiet -b custom master
-cat <<EOF >linux.morph
-{
-  "name": "linux",
-  "kind": "chunk",
-  "install-commands": [
-      "mkdir -p \"\$DESTDIR/boot\"",
-      "touch \"\$DESTDIR\"/boot/vmlinuz",
-      "touch \"\$DESTDIR\"/boot/System.map"
-  ]
-}
-EOF
-git add linux.morph
-
-git commit --quiet -m 'Make the kernel create a dummy zImage'
+cd "$DATADIR/morphs"
+sed -e 's/"system-kind": "syslinux-disk"/"system-kind": "disk"/' \
+    -i linux-system.morph
+git add linux-system.morph
+git commit --quiet -m "Build rootfs tarball system"
 
 rootfs=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
-    build-morphology test:morphs custom system)
+    build-morphology test:morphs master linux-system)
 
 for suffix in kernel rootfs
 do
-    if [ ! -e "$cache"/*system.system-"$suffix" ];
+    if [ ! -e "$cache"/*system.linux-system-"$suffix" ];
     then
-        echo "No .system.system-$suffix" 1>&2
+        echo "No .system.linux-system-$suffix" 1>&2
         find "$cache" 1>&2
         exit 1
     fi