Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set kpartx as default mapper tool for s390 #2403

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Set kpartx as default mapper tool for s390 #2403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions kiwi/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1791,6 +1791,9 @@ def get_part_mapper_tool():

:rtype: str
"""
host_architecture = Defaults.get_platform_name()
if 's390' in host_architecture:
return 'kpartx'
return 'partx'

@staticmethod
Expand Down
13 changes: 11 additions & 2 deletions test/unit/runtime_config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ def test_config_sections_from_home_base_config(self, mock_is_buildservice_worker
]

@patch('kiwi.runtime_checker.Defaults.is_buildservice_worker')
def test_config_sections_defaults(self, mock_is_buildservice_worker):
@patch('kiwi.runtime_checker.Defaults.get_platform_name')
def test_config_sections_defaults(
self, mock_get_platform_name, mock_is_buildservice_worker
):
mock_get_platform_name.return_value = 's390x'
mock_is_buildservice_worker.return_value = True
with patch.dict('os.environ', {'HOME': '../data/kiwi_config/defaults'}):
runtime_config = RuntimeConfig(reread=True)
Expand All @@ -93,11 +97,16 @@ def test_config_sections_defaults(self, mock_is_buildservice_worker):
assert runtime_config.get_container_compression() is True
assert runtime_config.get_iso_tool_category() == 'xorriso'
assert runtime_config.get_oci_archive_tool() == 'umoci'
assert runtime_config.get_mapper_tool() == 'partx'
assert runtime_config.get_mapper_tool() == 'kpartx'
assert runtime_config.get_package_changes() is False
assert runtime_config.\
get_credentials_verification_metadata_signing_key_file() == ''

mock_get_platform_name.return_value = 'x86_64'
with patch.dict('os.environ', {'HOME': '../data/kiwi_config/defaults'}):
runtime_config = RuntimeConfig(reread=True)
assert runtime_config.get_mapper_tool() == 'partx'

def test_config_sections_invalid(self):
with patch.dict('os.environ', {'HOME': '../data/kiwi_config/invalid'}):
runtime_config = RuntimeConfig(reread=True)
Expand Down