summaryrefslogtreecommitdiff
path: root/tests.branching
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-06 10:23:57 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-03-13 15:20:02 +0000
commit84807d4d7c23f45d4f0a0f87e6c7ba7ba7470936 (patch)
tree7a0a2c96fd33b471974d437ac427fc98f5e9c38c /tests.branching
parent92d98f57eaa6e0871b70d0d0ab1db879cf3ea47a (diff)
downloadmorph-84807d4d7c23f45d4f0a0f87e6c7ba7ba7470936.tar.gz
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.
Diffstat (limited to 'tests.branching')
-rw-r--r--tests.branching/workflow-petrify.stdout6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests.branching/workflow-petrify.stdout b/tests.branching/workflow-petrify.stdout
index b572ed67..c86afa2e 100644
--- a/tests.branching/workflow-petrify.stdout
+++ b/tests.branching/workflow-petrify.stdout
@@ -31,6 +31,7 @@ test/petrify after petrifying:
"name": "hello",
"repo": "test:stratum2-hello",
"ref": "f4730636e429149bb923fa16be3aa9802d484b23",
+ "build-mode": "test",
"build-depends": [],
"unpetrify-ref": "master"
}
@@ -44,6 +45,7 @@ test/petrify after petrifying:
"name": "hello",
"repo": "test:stratum3-hello",
"ref": "f4730636e429149bb923fa16be3aa9802d484b23",
+ "build-mode": "test",
"build-depends": [],
"unpetrify-ref": "master"
}
@@ -83,6 +85,7 @@ test/petrify after editing a chunk:
"name": "hello",
"repo": "test:stratum2-hello",
"ref": "test/petrify",
+ "build-mode": "test",
"build-depends": []
}
]
@@ -95,6 +98,7 @@ test/petrify after editing a chunk:
"name": "hello",
"repo": "test:stratum3-hello",
"ref": "f4730636e429149bb923fa16be3aa9802d484b23",
+ "build-mode": "test",
"build-depends": [],
"unpetrify-ref": "master"
}
@@ -134,6 +138,7 @@ test/unpetrify after unpetrifying:
"name": "hello",
"repo": "test:stratum2-hello",
"ref": "test/petrify",
+ "build-mode": "test",
"build-depends": []
}
]
@@ -146,6 +151,7 @@ test/unpetrify after unpetrifying:
"name": "hello",
"repo": "test:stratum3-hello",
"ref": "master",
+ "build-mode": "test",
"build-depends": []
}
]