almalinux/pungi
13
1
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 +12 -4
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 195bfbefa4 - Show all commits

6
doc/configuration.rst
View File

@ -1849,8 +1849,10 @@ they are not scratch builds).
A value for ``yum_repourls`` will be created automatically and point at a A value for ``yum_repourls`` will be created automatically and point at a
repository in the current compose. You can add extra repositories with repository in the current compose. You can add extra repositories with
``repo`` key having a list of urls pointing to ``.repo`` files or just ``repo`` key having a list of urls pointing to ``.repo`` files or just
variant uid, Pungi will create the .repo file for that variant. ``gpgkey`` variant uid, Pungi will create the .repo file for that variant. If
can be specified to enable gpgcheck in repo files for variants. specific URL is used in the ``repo``, the ``$COMPOSE_ID`` variable in
the ``repo`` string will be replaced with the real compose ID.
``gpgkey`` can be specified to enable gpgcheck in repo files for variants.
**osbs_registries** **osbs_registries**
(*dict*) -- It is possible to configure extra information about where to (*dict*) -- It is possible to configure extra information about where to

2
pungi/phases/osbs.py
View File

@ -128,7 +128,7 @@ class OSBSThread(WorkerThread):
file pointing to that location and return the URL to .repo file. file pointing to that location and return the URL to .repo file.
""" """
if "://" in repo: if "://" in repo:
return repo return repo.replace("$COMPOSE_ID", compose.compose_id)
if repo.startswith("/"): if repo.startswith("/"):
# The repo is an absolute path on the filesystem # The repo is an absolute path on the filesystem

8
tests/test_osbs_phase.py
View File

@ -330,7 +330,12 @@ class OSBSThreadTest(helpers.PungiTestCase):
"git_branch": "f24-docker", "git_branch": "f24-docker",
"name": "my-name", "name": "my-name",
"version": "1.0", "version": "1.0",
"repo": ["Everything", "http://pkgs.example.com/my.repo", "/extra/repo"], "repo": [
"Everything",
"http://pkgs.example.com/my.repo",
"/extra/repo",
"http://cts.localhost/$COMPOSE_ID/repo",
],
} }
self.compose.conf["translate_paths"].append(("/extra", "http://example.com")) self.compose.conf["translate_paths"].append(("/extra", "http://example.com"))
self._setupMock(KojiWrapper) self._setupMock(KojiWrapper)
@ -347,6 +352,7 @@ class OSBSThreadTest(helpers.PungiTestCase):
"http://root/work/global/tmp-Everything/compose-rpms-Everything-1.repo", "http://root/work/global/tmp-Everything/compose-rpms-Everything-1.repo",
"http://pkgs.example.com/my.repo", "http://pkgs.example.com/my.repo",
"http://root/work/global/tmp/compose-rpms-local-1.repo", "http://root/work/global/tmp/compose-rpms-local-1.repo",
"http://cts.localhost/%s/repo" % self.compose.compose_id,
], ],
} }
self._assertCorrectCalls(options) self._assertCorrectCalls(options)