[live-images] Add repos from other variants
This patch adds option for adding repositories from other variants to the koji task for building images. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář
parent
6e0f6ee73e
commit
9059852ab5
@ -67,6 +67,19 @@ class LiveImagesPhase(PhaseBase):
|
||||
return True
|
||||
return False
|
||||
|
||||
def _get_extra_repos(self, arch, variant, extras):
|
||||
repo = []
|
||||
for extra in extras:
|
||||
v = self.compose.variants.get(extra)
|
||||
if not v:
|
||||
raise RuntimeError(
|
||||
'There is no variant %s to get repo from when building live image for %s.'
|
||||
% (extra, variant.uid))
|
||||
repo.append(translate_path(
|
||||
self.compose, self.compose.paths.compose.repository(arch, v, create_dir=False)))
|
||||
|
||||
return repo
|
||||
|
||||
def run(self):
|
||||
symlink_isos_to = self.compose.conf.get("symlink_isos_to", None)
|
||||
iso = IsoWrapper()
|
||||
@ -98,11 +111,13 @@ class LiveImagesPhase(PhaseBase):
|
||||
"cmd": [],
|
||||
"label": "", # currently not used
|
||||
}
|
||||
cmd["repos"] = [translate_path(self.compose, self.compose.paths.compose.repository(arch, variant))]
|
||||
cmd["repos"] = [translate_path(
|
||||
self.compose, self.compose.paths.compose.repository(arch, variant, create_dir=False))]
|
||||
|
||||
# additional repos
|
||||
data = get_arch_variant_data(self.compose.conf, "live_images", arch, variant)
|
||||
cmd["repos"].extend(data[0].get("additional_repos", []))
|
||||
cmd['repos'].extend(self._get_extra_repos(arch, variant, data[0].get('repos_from', [])))
|
||||
|
||||
# Explicit name and version
|
||||
cmd["name"] = data[0].get("name", None)
|
||||
|
||||
130
tests/test_liveimagesphase.py
Executable file
130
tests/test_liveimagesphase.py
Executable file
@ -0,0 +1,130 @@
|
||||
#!/usr/bin/env python2
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
|
||||
import unittest
|
||||
import mock
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
|
||||
|
||||
from pungi.phases.live_images import LiveImagesPhase
|
||||
from pungi.util import get_arch_variant_data
|
||||
|
||||
|
||||
class _DummyCompose(object):
|
||||
def __init__(self, config):
|
||||
self.compose_date = '20151203'
|
||||
self.compose_type_suffix = '.t'
|
||||
self.compose_respin = 0
|
||||
self.ci_base = mock.Mock(
|
||||
release_id='Test-1.0',
|
||||
release=mock.Mock(
|
||||
short='test',
|
||||
version='1.0',
|
||||
),
|
||||
)
|
||||
self.conf = config
|
||||
self.paths = mock.Mock(
|
||||
compose=mock.Mock(
|
||||
topdir=mock.Mock(return_value='/a/b'),
|
||||
repository=mock.Mock(
|
||||
side_effect=lambda arch, variant, create_dir=False: os.path.join('/repo', arch, variant.uid)
|
||||
),
|
||||
iso_dir=mock.Mock(
|
||||
side_effect=lambda arch, variant, symlink_to: os.path.join(
|
||||
'/iso_dir', arch, variant.uid
|
||||
)
|
||||
),
|
||||
iso_path=mock.Mock(
|
||||
side_effect=lambda arch, variant, filename, symlink_to: os.path.join(
|
||||
'/iso_dir', arch, variant.uid, filename
|
||||
)
|
||||
)
|
||||
),
|
||||
work=mock.Mock(
|
||||
image_build_conf=mock.Mock(
|
||||
side_effect=lambda variant, image_name, image_type:
|
||||
'-'.join([variant.uid, image_name, image_type])
|
||||
)
|
||||
),
|
||||
log=mock.Mock(
|
||||
log_file=mock.Mock(return_value='/a/b/log/log_file')
|
||||
)
|
||||
)
|
||||
self._logger = mock.Mock()
|
||||
self.variants = {
|
||||
'Server': mock.Mock(uid='Server', arches=['x86_64', 'amd64']),
|
||||
'Client': mock.Mock(uid='Client', arches=['amd64']),
|
||||
'Everything': mock.Mock(uid='Everything', arches=['x86_64', 'amd64']),
|
||||
}
|
||||
self.im = mock.Mock()
|
||||
self.log_error = mock.Mock()
|
||||
self.get_image_name = mock.Mock(return_value='image-name')
|
||||
|
||||
def get_arches(self):
|
||||
return ['x86_64', 'amd64']
|
||||
|
||||
def get_variants(self, arch=None, types=None):
|
||||
return [v for v in self.variants.values() if not arch or arch in v.arches]
|
||||
|
||||
def can_fail(self, variant, arch, deliverable):
|
||||
failable = get_arch_variant_data(self.conf, 'failable_deliverables', arch, variant)
|
||||
return deliverable in failable
|
||||
|
||||
|
||||
class TestLiveImagesPhase(unittest.TestCase):
|
||||
|
||||
@mock.patch('pungi.phases.live_images.ThreadPool')
|
||||
@mock.patch('pungi.phases.live_images.get_ks_in')
|
||||
@mock.patch('pungi.phases.live_images.tweak_ks')
|
||||
def test_image_build(self, tweak_ks, get_ks_in, ThreadPool):
|
||||
compose = _DummyCompose({
|
||||
'live_images': [
|
||||
('^Client$', {
|
||||
'amd64': {
|
||||
'additional_repos': ['http://example.com/repo/'],
|
||||
'repos_from': ['Everything'],
|
||||
}
|
||||
})
|
||||
],
|
||||
})
|
||||
|
||||
get_ks_in.side_effect = (lambda compose, arch, variant:
|
||||
None if variant.uid != 'Client' or arch != 'amd64' else '/path/to/ks_in')
|
||||
tweak_ks.return_value = '/path/to/ks_file'
|
||||
|
||||
phase = LiveImagesPhase(compose)
|
||||
|
||||
phase.run()
|
||||
|
||||
# assert at least one thread was started
|
||||
self.assertTrue(phase.pool.add.called)
|
||||
self.maxDiff = None
|
||||
cmd = ' && '.join(['cd /iso_dir/amd64/Client',
|
||||
'isoinfo -R -f -i image-name | grep -v \'/TRANS.TBL$\' | sort >> image-name.manifest'])
|
||||
self.assertItemsEqual(phase.pool.queue_put.mock_calls,
|
||||
[mock.call((compose,
|
||||
{'ks_file': '/path/to/ks_file',
|
||||
'build_arch': 'amd64',
|
||||
'wrapped_rpms_path': '/iso_dir/amd64/Client',
|
||||
'scratch': False,
|
||||
'repos': ['/repo/amd64/Client',
|
||||
'http://example.com/repo/',
|
||||
'/repo/amd64/Everything'],
|
||||
'label': '',
|
||||
'arch': 'amd64',
|
||||
'name': None,
|
||||
'variant': compose.variants['Client'],
|
||||
'cmd': cmd,
|
||||
'iso_path': '/iso_dir/amd64/Client/image-name',
|
||||
'version': None,
|
||||
'specfile': None},
|
||||
compose.variants['Client'],
|
||||
'amd64'))])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Loading…
Reference in New Issue
Block a user