10:01 p.m.
repo: git.baserock.org/baserock/baserock/morph
branch: danielfirth/RT189
sha1: f4aaea23b7d80084504832d6b967a50c2d501b9e
Dan Firth (4):
Dropped support for 'disk-size' from system morphology files'
Dropped support for 'system-kind' from system morphology files
'system-kind' and 'disk-size' system morphology fields now raise
ObsoleteFieldError
Re-enabled validation for morph edit
morphlib/morph2.py | 21 +-----------
morphlib/morph2_tests.py | 36 --------------------
morphlib/morphloader.py | 35 +++++++++++---------
morphlib/morphloader_tests.py | 38 ++++++++++++----------
morphlib/morphologyfactory.py | 13 --------
morphlib/morphologyfactory_tests.py | 8 -----
morphlib/plugins/branch_and_merge_new_plugin.py | 10 ------
morphlib/plugins/branch_and_merge_plugin.py | 3 --
scripts/setup-3rd-party-strata | 2 --
tests.as-root/archless-system-fails.script | 3 +-
.../metadata-includes-morph-version.setup | 1 -
tests.as-root/metadata-includes-repo-alias.setup | 1 -
.../rootfs-tarball-builds-rootfs-and-kernel.script | 3 --
tests.as-root/setup | 4 ---
tests.as-root/system-overlap.script | 2 --
tests.as-root/tarball-image-is-sensible.setup | 1 -
tests.branching.disabled/workflow-petrify.stdout | 6 ----
.../edit-updates-stratum-build-depends.stdout | 28 ++--------------
tests.branching/edit-updates-stratum.stdout | 5 ++-
tests.branching/setup | 1 -
tests.branching/tag-creates-commit-and-tag.stdout | 11 +++----
tests.branching/tag-tag-works-as-expected.stdout | 11 +++----
.../tag-works-with-multiple-morphs-repos.script | 2 --
.../tag-works-with-multiple-morphs-repos.stdout | 16 ++++-----
tests.build/setup | 2 --
tests.deploy/setup | 2 --
tests.merging/setup | 2 --
tests/setup | 2 --
tests/show-dependencies.setup | 1 -
29 files changed, 63 insertions(+), 207 deletions(-)
--
1.8.1.2
10:01 p.m.
New subject: [PATCH 1/4] Dropped support for 'disk-size' from system morphology files'
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
morphlib/morph2.py | 20 +------------
morphlib/morph2_tests.py | 35 ----------------------
morphlib/morphloader.py | 1 -
morphlib/morphloader_tests.py | 1 -
morphlib/plugins/branch_and_merge_plugin.py | 2 --
scripts/setup-3rd-party-strata | 1 -
tests.as-root/archless-system-fails.script | 3 +-
tests.as-root/setup | 2 --
tests.as-root/system-overlap.script | 1 -
tests.branching.disabled/workflow-petrify.stdout | 3 --
.../tag-works-with-multiple-morphs-repos.script | 1 -
.../tag-works-with-multiple-morphs-repos.stdout | 16 +++++-----
tests.build/setup | 1 -
tests.merging/setup | 1 -
tests/setup | 1 -
15 files changed, 10 insertions(+), 79 deletions(-)
diff --git a/morphlib/morph2.py b/morphlib/morph2.py
index a733ce7..ec4f2e9 100644
--- a/morphlib/morph2.py
+++ b/morphlib/morph2.py
@@ -169,10 +169,6 @@ class Morphology(object):
self._set_default_value(self._dict, 'max-jobs',
int(self['max-jobs']))
- if 'disk-size' in self:
- self._set_default_value(self._dict, 'disk-size',
- self._parse_size(self['disk-size']))
-
for name, value in self.static_defaults[self['kind']]:
if name not in self._dict:
self._set_default_value(self._dict, name, value)
@@ -207,17 +203,6 @@ class Morphology(object):
'deploy',
dict())
- def _parse_size(self, size):
- if isinstance(size, basestring):
- size = size.lower()
- if size.endswith('g'):
- return int(size[:-1]) * 1024 ** 3
- elif size.endswith('m'): # pragma: no cover
- return int(size[:-1]) * 1024 ** 2
- elif size.endswith('k'): # pragma: no cover
- return int(size[:-1]) * 1024
- return int(size) # pragma: no cover
-
def lookup_child_by_name(self, name):
'''Find child reference by its name.
@@ -284,10 +269,7 @@ class Morphology(object):
# Simple values. Use original value unless it has been changed from
# the default in memmory.
if live_dict[key] == live_dict.get('_orig_' + key, None):
- if key in original_dict:
- result = original_dict[key]
- else:
- result = None
+ result = original_dict.get(key, None)
else:
result = live_dict[key]
return result
diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py
index bf32d3c..c11d705 100644
--- a/morphlib/morph2_tests.py
+++ b/morphlib/morph2_tests.py
@@ -96,29 +96,16 @@ class MorphologyTests(unittest.TestCase):
self.assertEqual(m['chunks'][0]['morph'], 'le-chunk')
self.assertEqual(m['chunks'][0]['build-depends'], None)
- def test_parses_system_disk_size(self):
- m = Morphology('''
- {
- "name": "foo",
- "kind": "system",
- "disk-size": "1g"
- }
- ''')
-
- self.assertEqual(m['disk-size'], 1024 ** 3)
-
def test_returns_dict_keys(self):
m = Morphology('''
{
"name": "foo",
"kind": "system",
- "disk-size": "1g"
}
''')
self.assertTrue('name' in m.keys())
self.assertTrue('kind' in m.keys())
- self.assertTrue('disk-size' in m.keys())
def test_system_indexes_strata(self):
m = Morphology('''
@@ -307,32 +294,10 @@ class MorphologyTests(unittest.TestCase):
system_text = '''{
"kind": "system",
- "disk-size": "1g",
"arch": "x86_64",
"system-kind": "rootfs-tarball"
}'''
- def test_writing_preserves_disk_size(self):
- text_lines = self.system_text.splitlines()
- morphology = Morphology(self.system_text)
-
- output = StringIO.StringIO()
- morphology.update_text(self.system_text, output)
- output_lines = output.getvalue().splitlines()
- self.assertEqual(text_lines, output_lines)
-
- def test_writing_updates_disk_size(self):
- text_lines = self.system_text.splitlines()
- text_lines[2] = ' "disk-size": 512,'
-
- morphology = Morphology(self.system_text)
- morphology._dict['disk-size'] = 512
-
- output = StringIO.StringIO()
- morphology.update_text(self.system_text, output)
- output_lines = output.getvalue().splitlines()
- self.assertEqual(text_lines, output_lines)
-
def test_nested_dict(self):
# Real morphologies don't trigger this code path, so we test manually
original_dict = {
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index c94078f..9b13450 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -146,7 +146,6 @@ class MorphologyLoader(object):
'arch': None,
'system-kind': 'rootfs-tarball',
'configuration-extensions': [],
- 'disk-size': '1G',
},
'cluster': {},
}
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index ac0fef5..d302551 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -474,7 +474,6 @@ name: foo
'arch': 'x86_64',
'strata': [],
'configuration-extensions': [],
- 'disk-size': '1G',
})
def test_unsets_defaults_for_system(self):
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index 37d5e40..3be6129 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -360,8 +360,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
'system': [
'kind',
'description',
- 'disk-size',
- '_disk-size',
'configuration-extensions',
],
'stratum': [
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata
index f2ea2a4..25ea325 100644
--- a/scripts/setup-3rd-party-strata
+++ b/scripts/setup-3rd-party-strata
@@ -99,7 +99,6 @@ cat <<EOF > "hello-system.morph"
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.as-root/archless-system-fails.script
b/tests.as-root/archless-system-fails.script
index eda797f..2fdeb01 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.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
@@ -26,7 +26,6 @@ cat <<EOF >archless-system.morph
{
"name": "archless-system",
"kind": "system",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.as-root/setup b/tests.as-root/setup
index eea9e06..2c5e09c 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -136,7 +136,6 @@ name: hello-system
kind: system
system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs
@@ -165,7 +164,6 @@ name: linux-system
kind: system
system-kind: rootfs-tarball
arch: `uname -m`
-disk-size: 1G
strata:
- morph: hello-stratum
repo: test:morphs
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 6e6ef2a..5df9374 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -33,7 +33,6 @@ cat <<EOF >overlap-system.morph
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
- "disk-size": "1G",
"strata": [
{
"morph": "foo-baz-stratum",
diff --git a/tests.branching.disabled/workflow-petrify.stdout
b/tests.branching.disabled/workflow-petrify.stdout
index 9f0cfb0..3531ee4 100644
--- a/tests.branching.disabled/workflow-petrify.stdout
+++ b/tests.branching.disabled/workflow-petrify.stdout
@@ -4,7 +4,6 @@ test/petrify after petrifying:
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
@@ -58,7 +57,6 @@ test/petrify after editing a chunk:
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
@@ -111,7 +109,6 @@ test/unpetrify after unpetrifying:
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script
b/tests.branching/tag-works-with-multiple-morphs-repos.script
index 38d7385..cdb65b0 100755
--- a/tests.branching/tag-works-with-multiple-morphs-repos.script
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.script
@@ -34,7 +34,6 @@ name: test-system
kind: system
system-kind: rootfs-tarball
arch: $(uname -m)
-disk-size: 1G
strata:
- morph: stratum1
ref: master
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
index 938e41f..f570b2c 100644
--- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
@@ -4,7 +4,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000
create tag
-commit 7253f9b1471f1983e07823d2b84582dde9fb108d
+commit 8378526fced8e920e486a58d047efe664831aa40
Author: developer <developer(a)example.com>
Date: Tue Jul 31 16:51:54 2012 +0000
@@ -67,11 +67,11 @@ index 0000000..610fae6
+ repo: test:hello
+ unpetrify-ref: master
diff --git a/test-system.morph b/test-system.morph
-index 44d5ae5..08f9adc 100644
+index 2fad584..6aa58c2 100644
--- a/test-system.morph
+++ b/test-system.morph
-@@ -5,8 +5,11 @@ arch: x86_64
- disk-size: 1G
+@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+ arch: x86_64
strata:
- morph: stratum1
- ref: master
@@ -85,7 +85,7 @@ index 44d5ae5..08f9adc 100644
+ repo: test:morphs1
+ unpetrify-ref: master
+ unpetrify-repo: test:morphs2
-commit 7253f9b1471f1983e07823d2b84582dde9fb108d
+commit 8378526fced8e920e486a58d047efe664831aa40
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
@@ -156,11 +156,11 @@ index 0000000..610fae6
+ repo: test:hello
+ unpetrify-ref: master
diff --git a/test-system.morph b/test-system.morph
-index 44d5ae5..08f9adc 100644
+index 2fad584..6aa58c2 100644
--- a/test-system.morph
+++ b/test-system.morph
-@@ -5,8 +5,11 @@ arch: x86_64
- disk-size: 1G
+@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+ arch: x86_64
strata:
- morph: stratum1
- ref: master
diff --git a/tests.build/setup b/tests.build/setup
index 499dbb2..5251680 100755
--- a/tests.build/setup
+++ b/tests.build/setup
@@ -109,7 +109,6 @@ cat <<EOF > hello-system.morph
"kind": "system",
"arch": "$(uname -m)",
"system-kind": "rootfs-tarball",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.merging/setup b/tests.merging/setup
index 11fdf0f..5be4993 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -53,7 +53,6 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests/setup b/tests/setup
index 91a3023..62f8071 100755
--- a/tests/setup
+++ b/tests/setup
@@ -108,7 +108,6 @@ cat <<EOF > hello-system.morph
"name": "hello-system",
"kind": "system",
"system-kind": "rootfs-tarball",
- "disk-size": "1G",
"strata": [
{
"morph": "hello-stratum",
--
1.8.1.2
10:01 p.m.
New subject: [PATCH 2/4] Dropped support for 'system-kind' from system morphology files
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
morphlib/morph2.py | 1 -
morphlib/morph2_tests.py | 1 -
morphlib/morphloader.py | 15 ------------
morphlib/morphloader_tests.py | 17 -------------
morphlib/morphologyfactory.py | 13 ----------
morphlib/morphologyfactory_tests.py | 8 -------
morphlib/plugins/branch_and_merge_plugin.py | 1 -
scripts/setup-3rd-party-strata | 1 -
.../metadata-includes-morph-version.setup | 1 -
tests.as-root/metadata-includes-repo-alias.setup | 1 -
.../rootfs-tarball-builds-rootfs-and-kernel.script | 3 ---
tests.as-root/setup | 2 --
tests.as-root/system-overlap.script | 1 -
tests.as-root/tarball-image-is-sensible.setup | 1 -
tests.branching.disabled/workflow-petrify.stdout | 3 ---
.../edit-updates-stratum-build-depends.stdout | 28 ++--------------------
tests.branching/edit-updates-stratum.stdout | 5 ++--
tests.branching/setup | 1 -
tests.branching/tag-creates-commit-and-tag.stdout | 11 ++++-----
tests.branching/tag-tag-works-as-expected.stdout | 11 ++++-----
.../tag-works-with-multiple-morphs-repos.script | 1 -
.../tag-works-with-multiple-morphs-repos.stdout | 12 +++++-----
tests.build/setup | 1 -
tests.deploy/setup | 2 --
tests.merging/setup | 1 -
tests/setup | 1 -
tests/show-dependencies.setup | 1 -
27 files changed, 20 insertions(+), 124 deletions(-)
diff --git a/morphlib/morph2.py b/morphlib/morph2.py
index ec4f2e9..862f34a 100644
--- a/morphlib/morph2.py
+++ b/morphlib/morph2.py
@@ -58,7 +58,6 @@ class Morphology(object):
('strata', []),
('description', ''),
('arch', None),
- ('system-kind', None),
('configuration-extensions', []),
],
'cluster': []
diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py
index c11d705..aaa1d1c 100644
--- a/morphlib/morph2_tests.py
+++ b/morphlib/morph2_tests.py
@@ -295,7 +295,6 @@ class MorphologyTests(unittest.TestCase):
system_text = '''{
"kind": "system",
"arch": "x86_64",
- "system-kind": "rootfs-tarball"
}'''
def test_nested_dict(self):
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index 9b13450..aea8777 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -62,14 +62,6 @@ class UnknownArchitectureError(morphlib.Error):
'Unknown architecture %s in morphology %s' % (arch, morphology))
-class InvalidSystemKindError(morphlib.Error):
-
- def __init__(self, system_kind, morphology):
- self.msg = (
- 'system-kind %s not allowed (must be rootfs-tarball), in %s' %
- (system_kind, morphology))
-
-
class NoBuildDependenciesError(morphlib.Error):
def __init__(self, stratum_name, chunk_name, morphology):
@@ -144,7 +136,6 @@ class MorphologyLoader(object):
'strata': [],
'description': '',
'arch': None,
- 'system-kind': 'rootfs-tarball',
'configuration-extensions': [],
},
'cluster': {},
@@ -259,12 +250,6 @@ class MorphologyLoader(object):
if morph['arch'] not in morphlib.valid_archs:
raise UnknownArchitectureError(morph['arch'], morph.filename)
- # If system-kind is present, it must be rootfs-tarball.
- if 'system-kind' in morph:
- if morph['system-kind'] not in (None, 'rootfs-tarball'):
- raise InvalidSystemKindError(
- morph['system-kind'], morph.filename)
-
def _validate_stratum(self, morph):
# Require at least one chunk.
if len(morph.get('chunks', [])) == 0:
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index d302551..7b37e30 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -182,22 +182,6 @@ build-system: dummy
self.loader.validate(m)
self.assertEqual(m['arch'], 'armv7l')
- def test_validate_requires_system_kind_to_be_tarball_if_present(self):
- m = morphlib.morph3.Morphology(
- {
- "kind": "system",
- "name": "foo",
- "arch": "armv7l",
- "strata": [],
- "system-kind": "blah",
- })
-
- self.assertRaises(
- morphlib.morphloader.InvalidSystemKindError,
- self.loader.validate, m)
- m['system-kind'] = 'rootfs-tarball'
- self.loader.validate(m)
-
def test_validate_requires_build_deps_for_chunks_in_strata(self):
m = morphlib.morph3.Morphology(
{
@@ -468,7 +452,6 @@ name: foo
dict(m),
{
'kind': 'system',
- 'system-kind': 'rootfs-tarball',
'name': 'foo',
'description': '',
'arch': 'x86_64',
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py
index ae5a433..5afafef 100644
--- a/morphlib/morphologyfactory.py
+++ b/morphlib/morphologyfactory.py
@@ -140,19 +140,6 @@ class MorphologyFactory(object):
(morphology['arch'],
', '.join(morphlib.valid_archs)))
- kind = morphology['system-kind']
- if kind == 'rootfs-tarball': # pragma: no cover
- self._app.status(
- msg='WARNING: Obsolete field system-kind used in morphology '
- '(it is harmless, but should be removed)')
- elif kind:
- raise morphlib.Error(
- 'System kind %s is not supported (anymore), '
- 'the whole system-kind field is deprecated. '
- 'Please remove system-kind from your system '
- 'morphologies and morph deploy to create '
- 'the desired output format.' % kind)
-
name = morphology['name']
morphology.builds_artifacts = [name + '-rootfs']
diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py
index 0648908..6e1e67d 100644
--- a/morphlib/morphologyfactory_tests.py
+++ b/morphlib/morphologyfactory_tests.py
@@ -118,7 +118,6 @@ class FakeLocalRepo(object):
'system.morph': '''{
"name": "system",
"kind": "system",
- "system-kind": "%(system_kind)s",
"arch": "%(arch)s"
}''',
'parse-error.morph': '''{ "name"''',
@@ -130,13 +129,11 @@ class FakeLocalRepo(object):
def __init__(self):
self.arch = 'x86_64'
- self.system_kind = ''
def cat(self, sha1, filename):
if filename in self.morphologies:
values = {
'arch': self.arch,
- 'system_kind': self.system_kind,
}
return self.morphologies[filename] % values
elif filename.endswith('.morph'):
@@ -308,11 +305,6 @@ class MorphologyFactoryTests(unittest.TestCase):
morph = self.mf.get_morphology('reponame', 'sha1',
'system.morph')
self.assertEqual(morph['arch'], 'armv7l')
- def test_fails_if_system_define_system_kind_that_is_not_tarball(self):
- self.lr.system_kind = 'blahblah'
- self.assertRaises(morphlib.Error, self.mf.get_morphology,
- 'reponame', 'sha1', 'system.morph')
-
def test_fails_on_parse_error(self):
self.assertRaises(morphlib.Error, self.mf.get_morphology,
'reponame', 'sha1',
'parse-error.morph')
diff --git a/morphlib/plugins/branch_and_merge_plugin.py
b/morphlib/plugins/branch_and_merge_plugin.py
index 3be6129..ea18dd4 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -339,7 +339,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
required = {
'system': [
'name',
- 'system-kind',
'arch',
'strata',
],
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata
index 25ea325..fc263f9 100644
--- a/scripts/setup-3rd-party-strata
+++ b/scripts/setup-3rd-party-strata
@@ -97,7 +97,6 @@ cat <<EOF > "hello-system.morph"
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "x86_64",
"strata": [
{
diff --git a/tests.as-root/metadata-includes-morph-version.setup
b/tests.as-root/metadata-includes-morph-version.setup
index 2284cfb..f0aefb3 100755
--- a/tests.as-root/metadata-includes-morph-version.setup
+++ b/tests.as-root/metadata-includes-morph-version.setup
@@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph
{
"name": "hello-tarball",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
diff --git a/tests.as-root/metadata-includes-repo-alias.setup
b/tests.as-root/metadata-includes-repo-alias.setup
index 2284cfb..f0aefb3 100755
--- a/tests.as-root/metadata-includes-repo-alias.setup
+++ b/tests.as-root/metadata-includes-repo-alias.setup
@@ -27,7 +27,6 @@ cat <<EOF > hello-tarball.morph
{
"name": "hello-tarball",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
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 8229127..93cd135 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -16,9 +16,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-## A system-kind of rootfs-tarball should build both kernel image and
-## a tarball with the root filesystem.
-
set -eu
# Disable test on versions of Python before 2.7.
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 2c5e09c..2ab1cd9 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -134,7 +134,6 @@ git add tools-stratum.morph
cat <<EOF > hello-system.morph
name: hello-system
kind: system
-system-kind: rootfs-tarball
arch: `uname -m`
strata:
- morph: hello-stratum
@@ -162,7 +161,6 @@ git add linux-stratum.morph
cat <<EOF > linux-system.morph
name: linux-system
kind: system
-system-kind: rootfs-tarball
arch: `uname -m`
strata:
- morph: hello-stratum
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 5df9374..41ff753 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -31,7 +31,6 @@ cat <<EOF >overlap-system.morph
{
"name": "overlap-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
diff --git a/tests.as-root/tarball-image-is-sensible.setup
b/tests.as-root/tarball-image-is-sensible.setup
index fa904c2..5fd7b28 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -46,7 +46,6 @@ cat <<EOF > hello-tarball.morph
{
"name": "hello-tarball",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
diff --git a/tests.branching.disabled/workflow-petrify.stdout
b/tests.branching.disabled/workflow-petrify.stdout
index 3531ee4..a0ce82f 100644
--- a/tests.branching.disabled/workflow-petrify.stdout
+++ b/tests.branching.disabled/workflow-petrify.stdout
@@ -2,7 +2,6 @@ test/petrify after petrifying:
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "x86_64",
"strata": [
{
@@ -55,7 +54,6 @@ test/petrify after editing a chunk:
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "x86_64",
"strata": [
{
@@ -107,7 +105,6 @@ test/unpetrify after unpetrifying:
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "x86_64",
"strata": [
{
diff --git a/tests.branching/edit-updates-stratum-build-depends.stdout
b/tests.branching/edit-updates-stratum-build-depends.stdout
index 1c6eb8e..7120ef5 100644
--- a/tests.branching/edit-updates-stratum-build-depends.stdout
+++ b/tests.branching/edit-updates-stratum-build-depends.stdout
@@ -13,10 +13,10 @@ index 73ed482..475fe0f 100644
kind: stratum
name: hello-stratum
diff --git a/hello-system.morph b/hello-system.morph
-index 721473c..1537f53 100644
+index 3f7b4d3..199c924 100644
--- a/hello-system.morph
+++ b/hello-system.morph
-@@ -3,9 +3,9 @@ kind: system
+@@ -3,5 +3,6 @@ kind: system
name: hello-system
strata:
- morph: hello-stratum
@@ -24,27 +24,3 @@ index 721473c..1537f53 100644
+ ref: newbranch
repo: test:morphs
+ unpetrify-ref: master
- - morph: xyzzy-stratum
- ref: master
- repo: test:morphs
--system-kind: rootfs-tarball
-diff --git a/xyzzy-stratum.morph b/xyzzy-stratum.morph
-index e302037..bcf5b57 100644
---- a/xyzzy-stratum.morph
-+++ b/xyzzy-stratum.morph
-@@ -1,11 +1,13 @@
- build-depends:
- - morph: hello-stratum
-- ref: master
-+ ref: newbranch
- repo: test:morphs
-+ unpetrify-ref: master
- chunks:
- - build-depends: []
- name: hello
-- ref: master
-+ ref: newbranch
- repo: test:hello
-+ unpetrify-ref: master
- kind: stratum
- name: xyzzy-stratum
diff --git a/tests.branching/edit-updates-stratum.stdout
b/tests.branching/edit-updates-stratum.stdout
index 32eb820..7120ef5 100644
--- a/tests.branching/edit-updates-stratum.stdout
+++ b/tests.branching/edit-updates-stratum.stdout
@@ -13,15 +13,14 @@ index 73ed482..475fe0f 100644
kind: stratum
name: hello-stratum
diff --git a/hello-system.morph b/hello-system.morph
-index b0fed3b..199c924 100644
+index 3f7b4d3..199c924 100644
--- a/hello-system.morph
+++ b/hello-system.morph
-@@ -3,6 +3,6 @@ kind: system
+@@ -3,5 +3,6 @@ kind: system
name: hello-system
strata:
- morph: hello-stratum
- ref: master
+ ref: newbranch
repo: test:morphs
--system-kind: rootfs-tarball
+ unpetrify-ref: master
diff --git a/tests.branching/setup b/tests.branching/setup
index 589f19e..1263e3b 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -55,7 +55,6 @@ strata:
- morph: hello-stratum
ref: master
repo: test:morphs
-system-kind: rootfs-tarball
EOF
cat <<EOF > "$DATADIR/morphs/hello-stratum.morph"
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout
b/tests.branching/tag-creates-commit-and-tag.stdout
index 598e28b..b6098eb 100644
--- a/tests.branching/tag-creates-commit-and-tag.stdout
+++ b/tests.branching/tag-creates-commit-and-tag.stdout
@@ -5,7 +5,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000
Message
-commit 9509c9c379f8ba643b2ad9a6ec50ecf96993cbb5
+commit 6895ed63425bedb3dccaea3f258c705b1600f6be
Author: developer <developer(a)example.com>
Date: Tue Jul 31 16:51:54 2012 +0000
@@ -26,10 +26,10 @@ index 73ed482..2218f63 100644
kind: stratum
name: hello-stratum
diff --git a/hello-system.morph b/hello-system.morph
-index b0fed3b..4c4ee3e 100644
+index 3f7b4d3..d909347 100644
--- a/hello-system.morph
+++ b/hello-system.morph
-@@ -3,6 +3,7 @@ kind: system
+@@ -3,5 +3,6 @@ kind: system
name: hello-system
strata:
- morph: hello-stratum
@@ -37,10 +37,9 @@ index b0fed3b..4c4ee3e 100644
+ ref: example-tag
repo: test:morphs
+ unpetrify-ref: master
- system-kind: rootfs-tarball
test:morphs
-commit 9509c9c379f8ba643b2ad9a6ec50ecf96993cbb5
+commit 6895ed63425bedb3dccaea3f258c705b1600f6be
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
@@ -48,7 +47,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
Message
-commit 1fe013ee284724848d65096d4d88f612fae56fc6
+commit e11a36aa9e4c998c41a3ec3209324b9318e484ae
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
diff --git a/tests.branching/tag-tag-works-as-expected.stdout
b/tests.branching/tag-tag-works-as-expected.stdout
index 242b2d4..98a3be8 100644
--- a/tests.branching/tag-tag-works-as-expected.stdout
+++ b/tests.branching/tag-tag-works-as-expected.stdout
@@ -9,7 +9,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000
Second
-commit ca7594f436da55bda2cfff2c6484d11aa0ea4cbc
+commit 476e4ff4b19c38eb64ad3a151b7c58a7ab95c9ee
Author: developer <developer(a)example.com>
Date: Tue Jul 31 16:51:54 2012 +0000
@@ -30,10 +30,10 @@ index 73ed482..2218f63 100644
kind: stratum
name: hello-stratum
diff --git a/hello-system.morph b/hello-system.morph
-index b0fed3b..875d73a 100644
+index 3f7b4d3..431e15d 100644
--- a/hello-system.morph
+++ b/hello-system.morph
-@@ -3,6 +3,7 @@ kind: system
+@@ -3,5 +3,6 @@ kind: system
name: hello-system
strata:
- morph: hello-stratum
@@ -41,10 +41,9 @@ index b0fed3b..875d73a 100644
+ ref: tagged-tag
repo: test:morphs
+ unpetrify-ref: master
- system-kind: rootfs-tarball
test:morphs
-commit ca7594f436da55bda2cfff2c6484d11aa0ea4cbc
+commit 476e4ff4b19c38eb64ad3a151b7c58a7ab95c9ee
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
@@ -52,7 +51,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
Second
-commit 1fe013ee284724848d65096d4d88f612fae56fc6
+commit e11a36aa9e4c998c41a3ec3209324b9318e484ae
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script
b/tests.branching/tag-works-with-multiple-morphs-repos.script
index cdb65b0..f6ecbf3 100755
--- a/tests.branching/tag-works-with-multiple-morphs-repos.script
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.script
@@ -32,7 +32,6 @@ mkdir "$DATADIR/morphs1"
cat <<EOF > "$DATADIR/morphs1/test-system.morph"
name: test-system
kind: system
-system-kind: rootfs-tarball
arch: $(uname -m)
strata:
- morph: stratum1
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
index f570b2c..ac2018e 100644
--- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
@@ -4,7 +4,7 @@ Date: Tue Jul 31 16:51:54 2012 +0000
create tag
-commit 8378526fced8e920e486a58d047efe664831aa40
+commit 7323ed5dcc47715e7303fd36d537aef98a04df9a
Author: developer <developer(a)example.com>
Date: Tue Jul 31 16:51:54 2012 +0000
@@ -67,10 +67,10 @@ index 0000000..610fae6
+ repo: test:hello
+ unpetrify-ref: master
diff --git a/test-system.morph b/test-system.morph
-index 2fad584..6aa58c2 100644
+index 62d3b08..edb5745 100644
--- a/test-system.morph
+++ b/test-system.morph
-@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+@@ -3,8 +3,11 @@ kind: system
arch: x86_64
strata:
- morph: stratum1
@@ -85,7 +85,7 @@ index 2fad584..6aa58c2 100644
+ repo: test:morphs1
+ unpetrify-ref: master
+ unpetrify-repo: test:morphs2
-commit 8378526fced8e920e486a58d047efe664831aa40
+commit 7323ed5dcc47715e7303fd36d537aef98a04df9a
Author: developer <developer(a)example.com>
AuthorDate: Tue Jul 31 16:51:54 2012 +0000
Commit: developer <developer(a)example.com>
@@ -156,10 +156,10 @@ index 0000000..610fae6
+ repo: test:hello
+ unpetrify-ref: master
diff --git a/test-system.morph b/test-system.morph
-index 2fad584..6aa58c2 100644
+index 62d3b08..edb5745 100644
--- a/test-system.morph
+++ b/test-system.morph
-@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+@@ -3,8 +3,11 @@ kind: system
arch: x86_64
strata:
- morph: stratum1
diff --git a/tests.build/setup b/tests.build/setup
index 5251680..563482e 100755
--- a/tests.build/setup
+++ b/tests.build/setup
@@ -108,7 +108,6 @@ cat <<EOF > hello-system.morph
"name": "hello-system",
"kind": "system",
"arch": "$(uname -m)",
- "system-kind": "rootfs-tarball",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests.deploy/setup b/tests.deploy/setup
index 88488a9..5f83747 100755
--- a/tests.deploy/setup
+++ b/tests.deploy/setup
@@ -112,7 +112,6 @@ cat <<EOF > hello-system.morph
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
@@ -153,7 +152,6 @@ cat <<EOF > linux-system.morph
{
"name": "linux-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
diff --git a/tests.merging/setup b/tests.merging/setup
index 5be4993..2fdf9db 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -51,7 +51,6 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
diff --git a/tests/setup b/tests/setup
index 62f8071..07643dd 100755
--- a/tests/setup
+++ b/tests/setup
@@ -107,7 +107,6 @@ cat <<EOF > hello-system.morph
{
"name": "hello-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"strata": [
{
"morph": "hello-stratum",
diff --git a/tests/show-dependencies.setup b/tests/show-dependencies.setup
index 9c983d8..edb9b6a 100755
--- a/tests/show-dependencies.setup
+++ b/tests/show-dependencies.setup
@@ -349,7 +349,6 @@ cat <<EOF > xfce-system.morph
{
"name": "xfce-system",
"kind": "system",
- "system-kind": "rootfs-tarball",
"arch": "$(uname -m)",
"strata": [
{
--
1.8.1.2
10:01 p.m.
New subject: [PATCH 3/4] 'system-kind' and 'disk-size' system morphology fields now raise ObsoleteFieldError
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
morphlib/morphloader.py | 19 +++++++++++++++++++
morphlib/morphloader_tests.py | 20 ++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index aea8777..9601784 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -54,6 +54,11 @@ class InvalidFieldError(morphlib.Error):
self.msg = (
'Field %s not allowed in morphology %s' % (field, morphology))
+class ObsoleteFieldError(morphlib.Error):
+
+ def __init__(self, field, morphology):
+ self.msg = (
+ 'Field %s is now obsolete but present in %s' % (field, morphology))
class UnknownArchitectureError(morphlib.Error):
@@ -107,6 +112,13 @@ class MorphologyLoader(object):
],
}
+ _obsolete_fields = {
+ 'system': [
+ 'system-kind',
+ 'disk-size',
+ ],
+ }
+
_static_defaults = {
'chunk': {
'description': '',
@@ -219,8 +231,10 @@ class MorphologyLoader(object):
raise UnknownKindError(morph['kind'], morph.filename)
required = ['kind'] + self._required_fields[kind]
+ obsolete = self._obsolete_fields.get(kind, [])
allowed = self._static_defaults[kind].keys()
self._require_fields(required, morph)
+ self._deny_obsolete_fields(obsolete, morph)
self._deny_unknown_fields(required + allowed, morph)
if kind == 'system':
@@ -292,6 +306,11 @@ class MorphologyLoader(object):
for field in fields:
self._require_field(field, morphology)
+ def _deny_obsolete_fields(self, fields, morphology):
+ for field in morphology:
+ if field in fields:
+ raise ObsoleteFieldError(field, morphology.filename)
+
def _deny_unknown_fields(self, allowed, morphology):
for field in morphology:
if field not in allowed:
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index 7b37e30..a06ba1e 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -94,6 +94,26 @@ build-system: dummy
self.assertRaises(
morphlib.morphloader.InvalidFieldError, self.loader.validate, m)
+ def test_fails_to_validate_system_with_obsolete_system_kind_field(self):
+ m = morphlib.morph3.Morphology({
+ 'kind': 'system',
+ 'name': 'foo',
+ 'arch': 'x86_64',
+ 'system-kind': 'foo',
+ })
+ self.assertRaises(
+ morphlib.morphloader.ObsoleteFieldError, self.loader.validate, m)
+
+ def test_fails_to_validate_system_with_obsolete_disk_size_field(self):
+ m = morphlib.morph3.Morphology({
+ 'kind': 'system',
+ 'name': 'foo',
+ 'arch': 'x86_64',
+ 'disk-size': 'over 9000',
+ })
+ self.assertRaises(
+ morphlib.morphloader.ObsoleteFieldError, self.loader.validate, m)
+
def test_fails_to_validate_system_with_no_fields(self):
m = morphlib.morph3.Morphology({
'kind': 'system',
--
1.8.1.2
12:41 a.m.
New subject: [PATCH 3/4] 'system-kind' and 'disk-size' system morphology fields now raise ObsoleteFieldError
On Tue, Oct 01, 2013 at 02:01:18PM +0100, Daniel Firth wrote:
+ def _deny_obsolete_fields(self, fields, morphology):
+ for field in morphology:
+ if field in fields:
+ raise ObsoleteFieldError(field, morphology.filename)
This only reports the first obsolete field: after that, the exception
has been raised, and execution has left the method. It would probably
be best to report all the obsolete fields at once, in one exception.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
10:01 p.m.
New subject: [PATCH 4/4] Re-enabled validation for morph edit
From: Dan Firth <dan.firth(a)codethink.co.uk>
---
morphlib/plugins/branch_and_merge_new_plugin.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/morphlib/plugins/branch_and_merge_new_plugin.py
b/morphlib/plugins/branch_and_merge_new_plugin.py
index 39552ef..621bf90 100644
--- a/morphlib/plugins/branch_and_merge_new_plugin.py
+++ b/morphlib/plugins/branch_and_merge_new_plugin.py
@@ -417,16 +417,6 @@ class SimpleBranchAndMergePlugin(cliapp.Plugin):
sb = morphlib.sysbranchdir.open_from_within('.')
loader = morphlib.morphloader.MorphologyLoader()
- # FIXME: The old "morph edit" code did its own morphology validation,
- # which was much laxer than what MorphologyFactory does, or the
- # new MorphologyLoader does. This new "morph edit" uses
- # MorphologyLoader, and the stricter validation breaks the test
- # suite. However, I want to keep the test suite as untouched as
- # possible, until all the old code is gone (after which the test
- # suite will be refactored). Thus, to work around the test suite
- # breaking, we disable morphology validation for now.
- loader.validate = lambda *args: None
-
# Load the system morphology, and all stratum morphologies, including
# all the strata that are being build-depended on.
--
1.8.1.2
10:25 p.m.
New subject: [PATCH 0/4] Makes 'system-kind' and 'disk-size' system morphology fields obsolete.
On Tue, Oct 01, 2013 at 02:01:15PM +0100, Daniel Firth wrote:
repo: git.baserock.org/baserock/baserock/morph
branch: danielfirth/RT189
sha1: f4aaea23b7d80084504832d6b967a50c2d501b9e
Dan Firth (4):
Dropped support for 'disk-size' from system morphology files'
Dropped support for 'system-kind' from system morphology files
'system-kind' and 'disk-size' system morphology fields now raise
ObsoleteFieldError
Re-enabled validation for morph edit
The code makes sense to me, I've run the test suite, and tested that it
does what I expected it to (although it doesn't raise an error if we build,
since that's using the old branch and merge code).
I'm happy for this to be merged, +1
10:28 p.m.
New subject: [PATCH 0/4] Makes 'system-kind' and 'disk-size' system morphology fields obsolete.
On Wed, Oct 02, 2013 at 02:25:11PM +0100, Jonathan Maw wrote:
On Tue, Oct 01, 2013 at 02:01:15PM +0100, Daniel Firth wrote:
> repo: git.baserock.org/baserock/baserock/morph
> branch: danielfirth/RT189
> sha1: f4aaea23b7d80084504832d6b967a50c2d501b9e
>
> Dan Firth (4):
> Dropped support for 'disk-size' from system morphology files'
> Dropped support for 'system-kind' from system morphology files
> 'system-kind' and 'disk-size' system morphology fields now raise
> ObsoleteFieldError
> Re-enabled validation for morph edit
The code makes sense to me, I've run the test suite, and tested that it
does what I expected it to (although it doesn't raise an error if we build,
since that's using the old branch and merge code).
I'm happy for this to be merged, +1
I haven't had time to review yet, but I'll note that let's hold off merging
anything to master until the release is ready, in case we need to restart
the release from a fresh release branch.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
12:42 a.m.
New subject: [PATCH 0/4] Makes 'system-kind' and 'disk-size' system morphology fields obsolete.
On Tue, Oct 01, 2013 at 02:01:15PM +0100, Daniel Firth wrote:
repo: git.baserock.org/baserock/baserock/morph
branch: danielfirth/RT189
sha1: f4aaea23b7d80084504832d6b967a50c2d501b9e
Except for my niggle about reporting multiple fields at once, this is
+1 from me. I'll merge this, and will change the exception to report
all fields at once while doing so.
Thanks, Dan.
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
3642
days inactive
3649
days old
8 comments
3 participants
participants (3)
-
Daniel Firth -
Jonathan Maw -
Lars Wirzenius