Dropped support for 'system-kind' from system morphology files

7 files changed, 0 insertions, 56 deletions

diff --git a/morphlib/morph2.py b/morphlib/morph2.py
index ec4f2e9a..862f34ab 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 c11d7058..aaa1d1cc 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 9b134509..aea87777 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 d302551e..7b37e300 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 ae5a4332..5afafefb 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 06489085..6e1e67d3 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 3be61297..ea18dd47 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',
             ],