Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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_boxed_plugin/tasks/system_boxbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ def _validate_kiwi_build_command(self) -> List[str]:
for profile in sorted(set(self.global_args.get('--profile'))):
final_kiwi_build_command.append('--profile')
final_kiwi_build_command.append(profile)
if self.global_args.get('--kiwi-file'):
final_kiwi_build_command.append('--kiwi-file')
final_kiwi_build_command.append(self.global_args.get('--kiwi-file'))
final_kiwi_build_command += kiwi_build_command
log.info(
'Building with:{0} {1}'.format(
Expand Down
15 changes: 12 additions & 3 deletions test/unit/tasks/system_boxbuild_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ class TestSystemBoxbuildTask:
def setup(self):
sys.argv = [
sys.argv[0],
'--debug', '--profile', 'foo', '--type', 'oem',
'--debug',
'--profile', 'foo',
'--type', 'oem',
'--kiwi-file', 'appliance.kiwi',
'system', 'boxbuild',
'--box', 'universal',
'--box-memory', '4',
Expand Down Expand Up @@ -84,7 +87,10 @@ def test_process_system_boxbuild_container(self, mock_BoxContainerBuild):
)
box_containerbuild.run.assert_called_once_with(
[
'--debug', '--type', 'oem', '--profile', 'foo',
'--debug',
'--type', 'oem',
'--profile', 'foo',
'--kiwi-file', 'appliance.kiwi',
'system', 'build',
'--description', 'foo', '--target-dir', 'xxx',
'--allow-existing-root',
Expand All @@ -107,7 +113,10 @@ def test_process_system_boxbuild(self, mock_BoxBuild):
)
box_build.run.assert_called_once_with(
[
'--debug', '--type', 'oem', '--profile', 'foo',
'--debug',
'--type', 'oem',
'--profile', 'foo',
'--kiwi-file', 'appliance.kiwi',
'system', 'build',
'--description', 'foo', '--target-dir', 'xxx',
'--allow-existing-root',
Expand Down