almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

image_build: drop .tar.gz as an expected extension for docker

Browse Source 
Koji's image-build command has not been capable of producing a
docker image with .tar.gz as its extension since 2015:

https://pagure.io/koji/c/b489f282bee7a008108534404dd2e78efb2256e7?branch=master

as that commit message implies, the files have not actually been
gzip-compressed for even longer:

https://pagure.io/koji/c/82a405c7943192e3bba3340efe7a8d07a0e26b70?branch=master

so there's no point to having this any more. It is causing the
wrong productmd 'type' to be set for GCE cloud images, which *do*
have the .tar.gz extension - because docker appears in this dict
before tar-gz, their type is being set as 'docker' not 'tar-gz'.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
(cherry picked from commit 739062ed3c471e74ba9c5144c4047f67f9fbe8c8)
This commit is contained in:
Adam Williamson 2024-09-19 14:00:45 -07:00 committed by Stepan Oksanichenko
parent 53c273f025
commit 059995a200
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/image_build.py
View File

@ -28,7 +28,7 @@ from productmd.rpms import Rpms
# values. This dict is imported and extended for similar purposes by other # values. This dict is imported and extended for similar purposes by other
# phases (at least osbuild and kiwibuild). # phases (at least osbuild and kiwibuild).
EXTENSIONS = { EXTENSIONS = {
"docker": ["tar.gz", "tar.xz"], "docker": ["tar.xz"],
"liveimg-squashfs": ["liveimg.squashfs"], "liveimg-squashfs": ["liveimg.squashfs"],
"qcow": ["qcow"], "qcow": ["qcow"],
"qcow2": ["qcow2"], "qcow2": ["qcow2"],

20
tests/test_imagebuildphase.py
View File

@ -843,12 +843,12 @@ class TestCreateImageBuildThread(PungiTestCase):
"amd64": [ "amd64": [
"/koji/task/1235/tdl-amd64.xml", "/koji/task/1235/tdl-amd64.xml",
"/koji/task/1235/Fedora-Docker-Base-20160103.amd64.qcow2", "/koji/task/1235/Fedora-Docker-Base-20160103.amd64.qcow2",
"/koji/task/1235/Fedora-Docker-Base-20160103.amd64.tar.gz", "/koji/task/1235/Fedora-Docker-Base-20160103.amd64.tar.xz",
], ],
"x86_64": [ "x86_64": [
"/koji/task/1235/tdl-x86_64.xml", "/koji/task/1235/tdl-x86_64.xml",
"/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.qcow2", "/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.qcow2",
"/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.tar.gz", "/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.tar.xz",
], ],
} }
@ -893,9 +893,9 @@ class TestCreateImageBuildThread(PungiTestCase):
link_type="hardlink-or-copy", link_type="hardlink-or-copy",
), ),
mock.call.link( mock.call.link(
"/koji/task/1235/Fedora-Docker-Base-20160103.amd64.tar.gz", "/koji/task/1235/Fedora-Docker-Base-20160103.amd64.tar.xz",
self.topdir self.topdir
+ "/compose/Client/amd64/images/Fedora-Docker-Base-20160103.amd64.tar.gz", # noqa: E501 + "/compose/Client/amd64/images/Fedora-Docker-Base-20160103.amd64.tar.xz", # noqa: E501
link_type="hardlink-or-copy", link_type="hardlink-or-copy",
), ),
mock.call.link( mock.call.link(
@ -905,9 +905,9 @@ class TestCreateImageBuildThread(PungiTestCase):
link_type="hardlink-or-copy", link_type="hardlink-or-copy",
), ),
mock.call.link( mock.call.link(
"/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.tar.gz", "/koji/task/1235/Fedora-Docker-Base-20160103.x86_64.tar.xz",
self.topdir self.topdir
+ "/compose/Client/x86_64/images/Fedora-Docker-Base-20160103.x86_64.tar.gz", # noqa: E501 + "/compose/Client/x86_64/images/Fedora-Docker-Base-20160103.x86_64.tar.xz", # noqa: E501
link_type="hardlink-or-copy", link_type="hardlink-or-copy",
), ),
], ],
@ -919,8 +919,8 @@ class TestCreateImageBuildThread(PungiTestCase):
"type": "qcow2", "type": "qcow2",
"arch": "amd64", "arch": "amd64",
}, },
"image_dir/Client/amd64/Fedora-Docker-Base-20160103.amd64.tar.gz": { "image_dir/Client/amd64/Fedora-Docker-Base-20160103.amd64.tar.xz": {
"format": "tar.gz", "format": "tar.xz",
"type": "docker", "type": "docker",
"arch": "amd64", "arch": "amd64",
}, },
@ -929,8 +929,8 @@ class TestCreateImageBuildThread(PungiTestCase):
"type": "qcow2", "type": "qcow2",
"arch": "x86_64", "arch": "x86_64",
}, },
"image_dir/Client/x86_64/Fedora-Docker-Base-20160103.x86_64.tar.gz": { "image_dir/Client/x86_64/Fedora-Docker-Base-20160103.x86_64.tar.xz": {
"format": "tar.gz", "format": "tar.xz",
"type": "docker", "type": "docker",
"arch": "x86_64", "arch": "x86_64",
}, },