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

Add support for --no-history umoci's flag

Browse Source 
Using this flag kiwi appends only a single history entry for OCI
containers.
This commit is contained in:
David Cassany 2018-11-09 13:28:14 +01:00
parent 2dc46b7734
commit 41eb4e2df6
No known key found for this signature in database
GPG Key ID: D91C0AAD9018D486
4 changed files with 67 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwi/oci_tools/base.py
View File

@ -56,6 +56,16 @@ class OCIBase(object):
'%Y-%m-%dT%H:%M:%S+00:00'
)
self.post_init()
def post_init(self):
"""
Post initialization method
Implementation in specialized OCI tool class if required
"""
pass
def init_layout(self, base_image=False):
"""
Initialize a new container layout

21
kiwi/oci_tools/umoci.py
View File

@ -19,12 +19,24 @@
# project
from kiwi.oci_tools.base import OCIBase
from kiwi.command import Command
from kiwi.utils.command_capabilities import CommandCapabilities
class OCIUmoci(OCIBase):
"""
**Open Container Operations using umoci**
"""
def post_init(self):
"""
Initializes some umoci parameters and options
"""
if CommandCapabilities.has_option_in_help(
'umoci', '--no-history', ['repack', '--help']
):
self.no_history_flag = ['--no-history']
else:
self.no_history_flag = []
def init_layout(self, base_image=False):
"""
Initialize a new container layout
@ -64,7 +76,9 @@ class OCIUmoci(OCIBase):
:param string oci_root_dir: root data directory
"""
Command.run(
['umoci', 'repack', '--image', self.container_name, oci_root_dir]
['umoci', 'repack'] + self.no_history_flag + [
'--image', self.container_name, oci_root_dir
]
)
def add_tag(self, tag_name):
@ -74,9 +88,8 @@ class OCIUmoci(OCIBase):
:param string tag_name: A name
"""
Command.run(
[
'umoci', 'config', '--image', self.container_name,
'--tag', tag_name
['umoci', 'config'] + self.no_history_flag + [
'--image', self.container_name, '--tag', tag_name
]
)

22
test/unit/container_image_oci_test.py
View File

@ -10,10 +10,12 @@ from kiwi.version import __version__
class TestContainerImageOCI(object):
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
@patch('kiwi.container.oci.RuntimeConfig')
@patch('kiwi.container.oci.OCI')
def setup(self, mock_OCI, mock_RuntimeConfig):
def setup(self, mock_OCI, mock_RuntimeConfig, mock_cmd_caps):
oci = mock.Mock()
mock_cmd_caps.return_value = True
oci.container_dir = 'kiwi_oci_dir.XXXX/oci_layout'
mock_OCI.return_value = oci
self.oci = ContainerImageOCI(
@ -23,7 +25,9 @@ class TestContainerImageOCI(object):
}
)
def test_init_custom_args(self):
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
def test_init_custom_args(self, mock_cmd_caps):
mock_cmd_caps.return_value = True
custom_args = {
'container_name': 'foo',
'container_tag': '1.0',
@ -43,7 +47,9 @@ class TestContainerImageOCI(object):
)
assert container.oci_config == custom_args
def test_init_without_custom_args(self):
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
def test_init_without_custom_args(self, mock_cmd_caps):
mock_cmd_caps.return_value = True
container = ContainerImageOCI('root_dir')
assert container.oci_config == {
'container_name': 'kiwi-container',
@ -52,10 +58,14 @@ class TestContainerImageOCI(object):
'history': {'created_by': 'KIWI {0}'.format(__version__)}
}
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
@patch('kiwi.defaults.Defaults.is_buildservice_worker')
@patch_open
def test_init_in_buildservice(self, mock_open, mock_buildservice):
def test_init_in_buildservice(
self, mock_open, mock_buildservice, mock_cmd_caps
):
mock_buildservice.return_value = True
mock_cmd_caps.return_value = True
handle = mock_open.return_value.__enter__.return_value
handle.__iter__.return_value =\
iter(['BUILD_DISTURL=obs://build.opensuse.org/some:project'])
@ -66,13 +76,15 @@ class TestContainerImageOCI(object):
'obs://build.opensuse.org/some:project'
}
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
@patch('kiwi.defaults.Defaults.is_buildservice_worker')
@patch_open
@patch('kiwi.logger.log.warning')
def test_init_in_buildservice_without_disturl(
self, mock_warn, mock_open, mock_buildservice
self, mock_warn, mock_open, mock_buildservice, mock_cmd_caps
):
mock_buildservice.return_value = True
mock_cmd_caps.return_value = True
handle = mock_open.return_value.__enter__.return_value
handle.__iter__.return_value = iter(['line content'])
container = ContainerImageOCI('root_dir')

27
test/unit/oci_tools_umoci_test.py
View File

@ -6,10 +6,12 @@ from kiwi.oci_tools.umoci import OCIUmoci
class TestOCIBase(object):
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
@patch('kiwi.oci_tools.base.datetime')
@patch('kiwi.oci_tools.base.mkdtemp')
def setup(self, mock_mkdtemp, mock_datetime):
def setup(self, mock_mkdtemp, mock_datetime, mock_cmd_caps):
mock_mkdtemp.return_value = 'tmpdir'
mock_cmd_caps.return_value = True
strftime = Mock()
strftime.strftime = Mock(return_value='current_date')
mock_datetime.utcnow = Mock(
@ -37,11 +39,28 @@ class TestOCIBase(object):
['umoci', 'unpack', '--image', 'tmpdir/oci_layout:tag', 'dir']
)
@patch('kiwi.oci_tools.base.mkdtemp')
@patch('kiwi.oci_tools.umoci.CommandCapabilities.has_option_in_help')
@patch('kiwi.oci_tools.umoci.Command.run')
def test_repack_with_history(
self, mock_Command_run, mock_cmd_caps, mock_mkdtemp
):
mock_mkdtemp.return_value = 'tmpdir'
mock_cmd_caps.return_value = False
oci = OCIUmoci('tag')
oci.repack('dir')
mock_Command_run.assert_called_once_with(
['umoci', 'repack', '--image', 'tmpdir/oci_layout:tag', 'dir']
)
@patch('kiwi.oci_tools.umoci.Command.run')
def test_repack(self, mock_Command_run):
self.oci.repack('dir')
mock_Command_run.assert_called_once_with(
['umoci', 'repack', '--image', 'tmpdir/oci_layout:tag', 'dir']
[
'umoci', 'repack', '--no-history', '--image',
'tmpdir/oci_layout:tag', 'dir'
]
)
@patch('kiwi.oci_tools.umoci.Command.run')
@ -49,8 +68,8 @@ class TestOCIBase(object):
self.oci.add_tag('other_tag')
mock_Command_run.assert_called_once_with(
[
'umoci', 'config', '--image', 'tmpdir/oci_layout:tag',
'--tag', 'other_tag'
'umoci', 'config', '--no-history', '--image',
'tmpdir/oci_layout:tag', '--tag', 'other_tag'
]
)