almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

livemedia: Remove title option 

Fixes: https://pagure.io/pungi/issue/1293
JIRA: COMPOSE-3947
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2019-11-20 14:23:02 +08:00
parent 242100eb72
commit 0c040e0a69
3 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pungi/checks.py
View File

@ -1065,7 +1065,6 @@ def make_schema():
"skip_tag": {"type": "boolean"},
"name": {"type": "string"},
"subvariant": {"type": "string"},
"title": {"type": "string"},
"repo": {"$ref": "#/definitions/repos"},
"target": {"type": "string"},
"arches": {"$ref": "#/definitions/list_of_strings"},

1
pungi/phases/livemedia_phase.py
View File

@ -71,7 +71,6 @@ class LiveMediaPhase(PhaseLoggerMixin, ImageConfigMixin, ConfigGuardedPhase):
'skip_tag': image_conf.get('skip_tag'),
'name': name,
'subvariant': subvariant,
'title': image_conf.get('title'),
'repo': self._get_repos(image_conf, variant),
'install_tree': self._get_install_tree(image_conf, variant),
'version': self.get_version(image_conf),

18
tests/test_livemediaphase.py
View File

@ -52,7 +52,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -97,7 +96,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -154,7 +152,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -173,7 +170,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -192,7 +188,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f25',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': '25',
'subvariant': 'Server',
@ -249,7 +244,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -268,7 +262,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': 'Rawhide',
'subvariant': 'Server',
@ -287,7 +280,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f25',
'title': None,
'install_tree': self.topdir + '/compose/Server/$basearch/os',
'version': '25',
'subvariant': 'Server',
@ -356,7 +348,6 @@ class TestLiveMediaPhase(PungiTestCase):
'name': 'Fedora Server Live',
'scratch': True,
'skip_tag': True,
'title': 'Custom Title',
'repo': ['http://example.com/extra_repo', 'Everything', 'Server-optional'],
'arches': ['x86_64'],
'ksversion': '24',
@ -393,7 +384,6 @@ class TestLiveMediaPhase(PungiTestCase):
'scratch': True,
'skip_tag': True,
'target': 'f24',
'title': 'Custom Title',
'install_tree': self.topdir + '/compose/Server-optional/$basearch/os',
'version': '25',
'subvariant': 'Something',
@ -422,7 +412,6 @@ class TestLiveMediaThread(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'version': 'Rawhide',
'subvariant': 'KDE',
'failable_arches': [],
@ -474,7 +463,6 @@ class TestLiveMediaThread(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'version': 'Rawhide',
'can_fail': []})])
self.assertEqual(get_image_paths.mock_calls,
@ -534,7 +522,6 @@ class TestLiveMediaThread(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'version': 'Rawhide',
'subvariant': 'KDE',
'failable_arches': ['amd64', 'x86_64'],
@ -567,7 +554,6 @@ class TestLiveMediaThread(PungiTestCase):
'ksversion': None,
'skip_tag': None,
'target': 'f24',
'title': None,
'release': None,
'version': 'Rawhide',
'scratch': False,
@ -597,7 +583,6 @@ class TestLiveMediaThread(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'version': 'Rawhide',
'subvariant': 'KDE',
'failable_arches': ['amd64', 'x86_64'],
@ -625,7 +610,6 @@ class TestLiveMediaThread(PungiTestCase):
'ksversion': None,
'skip_tag': None,
'target': 'f24',
'title': None,
'release': None,
'version': 'Rawhide',
'scratch': False,
@ -655,7 +639,6 @@ class TestLiveMediaThread(PungiTestCase):
'scratch': False,
'skip_tag': None,
'target': 'f24',
'title': None,
'version': 'Rawhide',
'subvariant': 'KDE',
'failable_arches': ['amd64'],
@ -680,7 +663,6 @@ class TestLiveMediaThread(PungiTestCase):
'ksversion': None,
'skip_tag': None,
'target': 'f24',
'title': None,
'release': None,
'version': 'Rawhide',
'scratch': False,