From 2a071ef057c953e81e1b8bd9b714373b4dbb26c2 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 28 Aug 2012 17:20:04 +0100
Subject: Strata should be referred to with full repo/ref/morph triplets

This removes the requirement that all strata must be in the same
repo as the system morphology.

Both the system "strata" field and the stratum "build-depends" field
are affected.
---
 tests.as-root/archless-system-fails.script                   |  6 +++++-
 tests.as-root/disk-builds-rootfs-and-kernel.script           |  6 +++++-
 tests.as-root/make-patch.script                              |  1 +
 tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script |  6 +++++-
 tests.as-root/setup                                          |  6 +++++-
 tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script  |  6 +++++-
 tests.as-root/syslinux-fails-if-no-mbr-found.script          |  6 +++++-
 tests.as-root/system-overlap.script                          | 12 ++++++++++--
 8 files changed, 41 insertions(+), 8 deletions(-)

(limited to 'tests.as-root')

diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index 6e14c875..02372b5b 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -31,7 +31,11 @@ cat <<EOF >archless-system.morph
   "kind": "system",
   "disk-size": "1G",
   "strata": [
-    "hello-stratum"
+    {
+      "morph": "hello-stratum",
+      "repo": "tests:morphs-repo",
+      "ref": "archless"
+    }
   ]
 }
 EOF
diff --git a/tests.as-root/disk-builds-rootfs-and-kernel.script b/tests.as-root/disk-builds-rootfs-and-kernel.script
index aacebae8..475df6c1 100755
--- a/tests.as-root/disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/disk-builds-rootfs-and-kernel.script
@@ -35,7 +35,11 @@ cat <<EOF >system.morph
   "arch": "$arch",
   "disk-size": "1G",
   "strata": [
-    "stratum"
+    {
+      "morph": "stratum",
+      "repo": "test:morphs-repo",
+      "ref": "custom"
+    }
   ]
 }
 EOF
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script
index 9fd58303..5204fce1 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -58,6 +58,7 @@ sed -i s/hello/goodbye/ "$DATADIR/chunk-repo/hello.c"
 # branch for the morphs repo.
 "$SRCDIR/scripts/run-git-in" "$DATADIR/morphs-repo" checkout --quiet -b alfred
 sed -i 's/farrokh/alfred/' "$DATADIR/morphs-repo/hello-stratum.morph"
+sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph"
 "$SRCDIR/scripts/run-git-in" "$DATADIR/morphs-repo" commit -am goodbye \
     > /dev/null
 
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 ed1dd642..c9bd418c 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -37,7 +37,11 @@ cat <<EOF >system.morph
   "arch": "$arch",
   "disk-size": "1G",
   "strata": [
-    "stratum"
+    {
+      "morph": "stratum",
+      "repo": "test:morphs-repo",
+      "ref": "custom"
+    }
   ]
 }
 EOF
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 5b63b685..2ba0adf9 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -110,7 +110,11 @@ cat <<EOF > hello-system.morph
     "arch": "$(uname -m)",
     "disk-size": "1G",
     "strata": [
-        "hello-stratum"
+        {
+            "morph": "hello-stratum",
+            "repo": "test:morphs-repo",
+            "ref": "master"
+        }
     ]
 }
 EOF
diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
index 7f2a6f01..6a968563 100755
--- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
+++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script
@@ -42,7 +42,11 @@ cat <<EOF >system.morph
   "arch": "$arch",
   "disk-size": "1G",
   "strata": [
-    "stratum"
+    {
+      "morph": "stratum",
+      "repo": "test:morphs-repo",
+      "ref": "custom"
+    }
   ]
 }
 EOF
diff --git a/tests.as-root/syslinux-fails-if-no-mbr-found.script b/tests.as-root/syslinux-fails-if-no-mbr-found.script
index 3e46f918..bb5f28cb 100755
--- a/tests.as-root/syslinux-fails-if-no-mbr-found.script
+++ b/tests.as-root/syslinux-fails-if-no-mbr-found.script
@@ -42,7 +42,11 @@ cat <<EOF >system.morph
   "arch": "$arch",
   "disk-size": "1G",
   "strata": [
-    "stratum"
+    {
+      "morph": "stratum",
+      "repo": "test:morphs-repo",
+      "ref": "custom"
+    }
   ]
 }
 EOF
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 17f1bf17..c7e6969a 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -34,8 +34,16 @@ cat <<EOF >overlap-system.morph
   "arch": "$(uname -m)",
   "disk-size": "1G",
   "strata": [
-    "foo-baz-stratum",
-    "foo-barqux-stratum"
+    {
+      "morph": "foo-baz-stratum",
+      "repo": "test:morphs-repo",
+      "ref": "overlap"
+    },
+    {
+      "morph": "foo-barqux-stratum",
+      "repo": "test:morphs-repo",
+      "ref": "overlap"
+    }
   ]
 }
 EOF
-- 
cgit v1.2.1