diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-07-28 15:23:09 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-17 10:39:25 +0000 |
| commit | b652fc3cb55a238293c246f2bfad2a18ade39aef (patch) | |
| tree | af68bafdb62574e22e38e2e68cbbf55a514d34f7 /tests.branching/branch-creates-new-system-branch-not-from-master.stdout | |
| parent | b548e0e5094b1bfdc6f9242c4f26ce191c7b8aad (diff) | |
| download | morph-b652fc3cb55a238293c246f2bfad2a18ade39aef.tar.gz | |
Add support for Baserock definitions version 7
This adds a new 'Defaults' class to represent definitions defaults
The Python 'jsonschema' module is used to validate the contents of the
Defaults file. This module is already included in Baserock 'build' and
'devel' reference systems by way of the 'openstack-common' stratum.
This commit embeds a copy of the JSON-Schema schema for the DEFAULTS
file. I think the canonical location of this schema should be in the
reference definitions.git, for now. In future, the schemas should maybe
have their own repos. Either way, Morph should embed a copy for the time
being so that we are sure the schema matches how Morph expects to parse
the file.
Morph's automated tests are all updated to use definitions version 7.
I removed most of the tests for built-in build systems, because the
built-ins themselves are no longer part of Morph. Only the mechanism for
defining them needs to be tested now.
Change-Id: I65f8f1c967683ef605852bfae5c68518e53f9981
Diffstat (limited to 'tests.branching/branch-creates-new-system-branch-not-from-master.stdout')
| -rw-r--r-- | tests.branching/branch-creates-new-system-branch-not-from-master.stdout | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout index 78b3ca33..c5682475 100644 --- a/tests.branching/branch-creates-new-system-branch-not-from-master.stdout +++ b/tests.branching/branch-creates-new-system-branch-not-from-master.stdout @@ -7,6 +7,7 @@ d ./newbranch/test d ./newbranch/test/morphs d ./newbranch/test/morphs/.git f ./newbranch/.morph-system-branch/config +f ./newbranch/test/morphs/DEFAULTS f ./newbranch/test/morphs/VERSION f ./newbranch/test/morphs/hello-stratum.morph f ./newbranch/test/morphs/hello-system.morph |