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

27 files changed, 20 insertions, 124 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',
             ],
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata
index 25ea3254..fc263f96 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 2284cfb9..f0aefb3c 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 2284cfb9..f0aefb3c 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 8229127d..93cd135f 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 2c5e09ca..2ab1cd94 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 5df9374b..41ff7536 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 fa904c2c..5fd7b283 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 3531ee4b..a0ce82f4 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 1c6eb8e3..7120ef50 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 32eb820d..7120ef50 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 589f19ed..1263e3b6 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 598e28bf..b6098eb5 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@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@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -48,7 +47,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
 
     Message
 
-commit 1fe013ee284724848d65096d4d88f612fae56fc6
+commit e11a36aa9e4c998c41a3ec3209324b9318e484ae
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout
index 242b2d4e..98a3be81 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@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@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -52,7 +51,7 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000
 
     Second
 
-commit 1fe013ee284724848d65096d4d88f612fae56fc6
+commit e11a36aa9e4c998c41a3ec3209324b9318e484ae
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@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 cdb65b04..f6ecbf32 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 f570b2cd..ac2018e9 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@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@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@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 52516804..563482e6 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 88488a91..5f83747e 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 5be4993a..2fdf9db0 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 62f8071d..07643ddc 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 9c983d8a..edb9b6ab 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": [
     {