Add 'build-mode' field for chunks in a stratum

Allowed values:

  staging: build with a staging chroot (default)
  test: build with the host's tools
  bootstrap: build with the host's tools, and do not include this
     chunk in the final stratum artifact

In the past, 'normal mode' has been used to describe building a chunk
with the host's tools. We don't want that mode to ever be used,
because it is a huge hole in reproducability, but we need to keep it
around to avoid making Morph's cmdtest suite depend on Baserock.
Hopefully naming it 'test' should discourage potential abusers.

It is unfortunate that the build tests now take a separate code path
compared to real-world usage of Morph. However, this is necessary to
avoid a circular dependency between Morph's test suite and the
build-essential stratum in Baserock.

We do whole-build testing of Baserock, too, so the 'staging' code path
is still tested outside of Morph. However, testing a staging area
requires populating it with at minimum a working shell, and this is a
bit too complex to go in Morph's test suite.

4 files changed, 10 insertions, 1 deletions

diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script
index 2d5d0fed..fd021399 100755
--- a/tests.as-root/build-with-external-strata.script
+++ b/tests.as-root/build-with-external-strata.script
@@ -38,6 +38,7 @@ cat <<EOF >> stratum2.morph
             "name": "linux",
             "repo": "test:kernel-repo",
             "ref": "master",
+            "build-mode": "test",
             "build-depends": []
         }
     ]
diff --git a/tests.as-root/setup b/tests.as-root/setup
index a85507e0..b9d5d477 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -110,6 +110,7 @@ chunks:
     - name: hello
       repo: test:chunk-repo
       ref: farrokh
+      build-mode: test
       build-depends: []
 EOF
 git add hello-stratum.morph
@@ -125,6 +126,7 @@ chunks:
     - name: tools
       repo: test:tools-repo
       ref: master
+      build-mode: test
       build-depends: []
 EOF
 git add tools-stratum.morph
@@ -153,6 +155,7 @@ chunks:
     - name: linux
       repo: test:kernel-repo
       ref: master
+      build-mode: test
       build-depends: []
 EOF
 git add linux-stratum.morph
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index cc308536..b8888491 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Codethink Limited
+# Copyright (C) 2011-2013  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -57,12 +57,14 @@ cat <<EOF >foo-baz-stratum.morph
       "name": "overlap-foo-baz",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": []
     },
     {
       "name": "linux",
       "repo": "test:kernel-repo",
       "ref": "master",
+      "build-mode": "test",
       "build-depends": ["overlap-foo-baz"]
     }
   ]
@@ -77,12 +79,14 @@ cat <<EOF >foo-barqux-stratum.morph
       "name": "overlap-foobar",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": []
     },
     {
       "name": "overlap-fooqux",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": ["overlap-foobar"]
     }
   ]
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index e159070c..fa904c2c 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -84,6 +84,7 @@ cat <<EOF > link-stratum.morph
             "name": "links",
             "repo": "test:chunk-repo",
             "ref": "tarball-links",
+            "build-mode": "test",
             "build-depends": []
         }
     ]