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

generate-test-cases: don't leak "supported_arches" to compose request

Browse source 
Unfortunately, after the addition of `supported_arches` item to some
of the image type definitions in `format-request-map.json`, it started
to leak to the `compose-request` object in the generated image test
case.

Ensure that the item does not leak to the generated image test case,
since it is relevant only for the generator script.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-09-22 13:30:30 +02:00 • committed by Tomáš Hozza
parent 4ea758a8bb
commit 0a3450ea3e
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/test-case-generators/generate-test-cases
View file

@ -237,14 +237,18 @@ def main(distro, arch, image_types, keep_image_info, store, output, with_customi
generate_test_case("customize", distro, arch, "qcow2", test_case_request, keep_image_info, store, output)
return
filtered_test_case_request_items = [
"overrides",
"supported_arches"
]
for output_format, test_case_request in format_request_dict.items():
filtered_request = dict(filter(lambda i: i[0] != "overrides", test_case_request.items()))
filtered_request = dict(filter(lambda i: i[0] not in filtered_test_case_request_items, test_case_request.items()))
if filtered_request["compose-request"]["image-type"] not in image_types:
continue
filtered_request["compose-request"]["distro"] = distro
# if the compose-request has specified supported arches, then generate
# the test case only if the requested arch is in the list
supported_arches = filtered_request.get("supported_arches")
supported_arches = test_case_request.get("supported_arches")
if supported_arches is not None and arch not in supported_arches:
continue
filtered_request["compose-request"]["arch"] = arch