particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop support for specifying more than one image type

Browse source 
While it is technically possible to build more than one image type
as part of a Koji compose in osbuild-composer, this option is not used
in reality and it also makes very little sense. If the user wants to
build more than one image type, they should submit multiple Koji builds.

Adjust affected unit tests.
This commit is contained in:
Tomas Hozza 2022-08-16 16:20:34 +02:00 • committed by Jakub Rusz
parent dd8233e8b7
commit c725265081
6 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

28
test/unit/test_builder.py
View file

@ -644,7 +644,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
handler = self.make_handler()
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
["x86_64"],
{}]
@ -667,7 +667,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64", "s390x"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos}]
@ -713,7 +713,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
handler = self.make_handler(session=session)
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
["x86_64"],
{}]
@ -745,7 +745,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
composer.httpretty_register()
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
composer.architectures,
{}]
@ -773,7 +773,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
composer.httpretty_register()
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
composer.architectures,
{}]
@ -802,7 +802,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
for it in ("qcow2", "ec2", "ec2-ha", "ec2-sap"):
args = ["name", "version", "distro",
[it],
it,
"fedora-candidate",
composer.architectures,
{"skip_tag": True}]
@ -822,7 +822,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
composer.httpretty_register()
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
composer.architectures,
{"skip_tag": True}]
@ -889,7 +889,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
composer.oauth_activate(token_url)
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
["x86_64"],
{}]
@ -931,7 +931,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos}]
@ -980,7 +980,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos}]
@ -1058,7 +1058,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos}]
@ -1081,7 +1081,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64", "s390x"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos,
@ -1118,7 +1118,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
arches = ["x86_64", "s390x"]
repos = ["http://1.repo", "https://2.repo"]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos,
@ -1175,7 +1175,7 @@ class TestBuilderPlugin(PluginTest): # pylint: disable=too-many-public-methods
{"baseurl": "https://third.repo/$arch"}
]
args = ["name", "version", "distro",
["image_type"],
"image_type",
"fedora-candidate",
arches,
{"repo": repos}]

8
test/unit/test_cli.py
View file

@ -92,7 +92,7 @@ class TestCliPlugin(PluginTest):
]
expected_args = ["name", "version", "distro",
['guest-image'], # the default image type
'guest-image', # the default image type
"target",
['arch1']]
@ -154,7 +154,7 @@ class TestCliPlugin(PluginTest):
]
expected_args = ["name", "version", "distro",
['guest-image'], # the default image type
'guest-image', # the default image type
"target",
['arch1']]
@ -207,7 +207,7 @@ class TestCliPlugin(PluginTest):
]
expected_args = ["name", "version", "distro",
['guest-image'], # the default image type
'guest-image', # the default image type
"target",
['arch1']]
@ -265,7 +265,7 @@ class TestCliPlugin(PluginTest):
]
expected_args = ["name", "version", "distro",
['guest-image'], # the default image type
'guest-image', # the default image type
"target",
['arch1']]

4
test/unit/test_hub.py
View file

@ -46,7 +46,7 @@ class TestHubPlugin(PluginTest):
"release": "1.2.3",
"skip_tag": True}
args = ["name", "version", "distro",
["image_type"],
"image_type",
"target",
["arches"],
opts]
@ -66,7 +66,7 @@ class TestHubPlugin(PluginTest):
opts = {}
args = ["name", "version", "distro",
"image_type", # image type not an array
["image_type"], # image type not an array
"target",
["arches"],
opts]