almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix container labels setup in OBS

Browse Source 
This commits fixes the containers label setup in OBS, ensuring that
adding the 'org.openbuildservice.disturl' label does not clear any
other label.

Fixes #1338
This commit is contained in:
David Cassany 2020-02-28 15:34:39 +01:00
parent 841d8d7bc9
commit 12d84be2fb
No known key found for this signature in database
GPG Key ID: D91C0AAD9018D486
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kiwi/container/oci.py
View File

@ -171,8 +171,8 @@ class ContainerImageOCI:
if line.startswith('BUILD_DISTURL') and '=' in line:
disturl = line.split('=')[1].lstrip('\'\"').rstrip('\n\'\"')
if disturl:
self.oci_config['labels'] = {
'org.openbuildservice.disturl': disturl
}
self.oci_config['labels'].update(
{'org.openbuildservice.disturl': disturl}
)
return
log.warning('Could not find BUILD_DISTURL inside .buildenv')

4
test/unit/container/image_oci_test.py
View File

@ -72,7 +72,9 @@ class TestContainerImageOCI:
with patch('builtins.open', m_open, create=True):
m_open.return_value.__iter__ = lambda _:\
iter(['BUILD_DISTURL=obs://build.opensuse.org/some:project'])
container = ContainerImageOCI('root_dir', 'oci-archive')
container = ContainerImageOCI(
'root_dir', 'oci-archive', {'labels': {}}
)
m_open.assert_called_once_with('/.buildenv')
assert container.oci_config['labels'] == {