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

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 535034ef91 - Show all commits

4
pungi/phases/image_container.py
View File

@ -53,7 +53,7 @@ class ImageContainerThread(WorkerThread):
self._get_repo( self._get_repo(
compose, compose,
variant, variant,
config.get("arch_override", "").split(" "), config.get("arch_override", "").split(),
config.pop("image_spec"), config.pop("image_spec"),
) )
] ]
@ -95,7 +95,7 @@ class ImageContainerThread(WorkerThread):
if not re.match(value, getattr(image, key)): if not re.match(value, getattr(image, key)):
break break
else: else:
image_paths.add(image.path) image_paths.add(image.path.replace(arch, "$basearch"))
if len(image_paths) != 1: if len(image_paths) != 1:
raise RuntimeError( raise RuntimeError(

4
tests/test_image_container_phase.py
View File

@ -130,7 +130,6 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
"target": "f24-docker-candidate", "target": "f24-docker-candidate",
"git_branch": "f24-docker", "git_branch": "f24-docker",
"image_spec": {"type": "qcow2"}, "image_spec": {"type": "qcow2"},
"arch_override": "x86_64",
} }
self.compose.im.images["Server"] = { self.compose.im.images["Server"] = {
"x86_64": [ "x86_64": [
@ -150,7 +149,7 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
repo_content = list(f) repo_content = list(f)
self.assertIn("[image-to-include]\n", repo_content) self.assertIn("[image-to-include]\n", repo_content)
self.assertIn( self.assertIn(
"baseurl=http://root/compose/Server/x86_64/images/image.qcow2\n", "baseurl=http://root/compose/Server/$basearch/images/image.qcow2\n",
repo_content, repo_content,
) )
self.assertIn("enabled=0\n", repo_content) self.assertIn("enabled=0\n", repo_content)
@ -158,7 +157,6 @@ class ImageContainerThreadTest(helpers.PungiTestCase):
def assertKojiCalls(self, cfg, scratch=False): def assertKojiCalls(self, cfg, scratch=False):
opts = { opts = {
"git_branch": cfg["git_branch"], "git_branch": cfg["git_branch"],
"arch_override": cfg["arch_override"],
"yum_repourls": ["http://root/" + self.repofile_path], "yum_repourls": ["http://root/" + self.repofile_path],
} }
if scratch: if scratch: