robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kiwibuild: Add support for type, type attr and bundle format

Browse source 
This is a very basic support. Whatever users specify in the new option
will be passed to the koji task.

Related: https://bugzilla.redhat.com/show_bug.cgi?id=2270197
Related: https://pagure.io/koji/pull-request/4157
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2024-03-20 14:30:09 +01:00 • committed by lsedlar
parent d546a49299
commit e43cf68f08
4 changed files with 70 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

44
tests/test_kiwibuildphase.py
View file

@ -47,6 +47,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": None,
"type_attr": None,
"bundle_name_format": None,
},
[self.topdir + "/compose/Server/$arch/os"],
[], # failable arches
@ -63,6 +66,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"repos": ["https://example.com/repo/", "Client"],
"failable": ["*"],
"subvariant": "Test",
"type": "custom",
"type_attr": ["foo", "bar"],
"bundle_name_format": "fmt",
},
MINIMAL_CONF,
)
@ -86,6 +92,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": "custom",
"type_attr": ["foo", "bar"],
"bundle_name_format": "fmt",
},
[
"https://example.com/repo/",
@ -119,6 +128,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": None,
"type_attr": None,
"bundle_name_format": None,
},
[self.topdir + "/compose/Server/$arch/os"],
["x86_64"], # failable arches
@ -136,6 +148,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"kiwibuild_release": "1234",
"kiwibuild_description_scm": "foo",
"kiwibuild_description_path": "bar",
"kiwibuild_type": "custom",
"kiwibuild_type_attr": ["foo", "bar"],
"kiwibuild_bundle_name_format": "fmt",
},
)
@ -157,6 +172,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"target": "f40",
"descscm": "foo",
"descpath": "bar",
"type": "custom",
"type_attr": ["foo", "bar"],
"bundle_name_format": "fmt",
},
[self.topdir + "/compose/Server/$arch/os"],
[], # failable arches
@ -193,6 +211,9 @@ class TestKiwiBuildPhase(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": None,
"type_attr": None,
"bundle_name_format": None,
},
[self.topdir + "/compose/Server/$arch/os"],
[], # failable arches
@ -215,7 +236,13 @@ class TestKiwiBuildThread(PungiTestCase):
def test_process(self, KojiWrapper, get_file_size, get_mtime, Linker):
img_name = "FCBG.{arch}-Rawhide-1.6.vagrant.libvirt.box"
self.repo = self.topdir + "/compose/Server/$arch/os"
compose = DummyCompose(self.topdir, {"koji_profile": "koji"})
compose = DummyCompose(
self.topdir,
{
"koji_profile": "koji",
"kiwibuild_bundle_format": "%N-%P-40_Beta-%I.%A.%T",
},
)
config = _merge({"subvariant": "Test"}, MINIMAL_CONF)
pool = mock.Mock()
@ -248,6 +275,9 @@ class TestKiwiBuildThread(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": "t",
"type_attr": ["ta"],
"bundle_name_format": "fmt",
},
[self.repo],
[],
@ -264,6 +294,9 @@ class TestKiwiBuildThread(PungiTestCase):
profile=MINIMAL_CONF["kiwi_profile"],
release="1.6",
repos=[self.repo],
type="t",
type_attr=["ta"],
result_bundle_name_format="fmt",
optional_arches=[],
)
]
@ -326,6 +359,9 @@ class TestKiwiBuildThread(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": None,
"type_attr": None,
"bundle_name_format": None,
},
[self.repo],
[],
@ -374,6 +410,9 @@ class TestKiwiBuildThread(PungiTestCase):
"target": "f40",
"descscm": MINIMAL_CONF["description_scm"],
"descpath": MINIMAL_CONF["description_path"],
"type": None,
"type_attr": None,
"bundle_name_format": None,
},
[self.repo],
["amd64"],
@ -390,6 +429,9 @@ class TestKiwiBuildThread(PungiTestCase):
profile=MINIMAL_CONF["kiwi_profile"],
release="1.6",
repos=[self.repo],
type=None,
type_attr=None,
result_bundle_name_format=None,
optional_arches=["amd64"],
)
]