almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

ostree: Fix arg passed to scm.get_dir_from_scm

Browse Source 
A compose object should be passed instead of logger.

JIRA: COMPOSE-4050
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2020-01-02 10:16:50 +08:00 committed by lsedlar
parent b8bb4f7daa
commit b415e31f9d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pungi/phases/ostree.py
View File

@ -72,7 +72,7 @@ class OSTreeThread(WorkerThread):
self.logdir = compose.paths.log.topdir('%s/%s/ostree-%d' %
(arch, variant.uid, self.num))
repodir = os.path.join(workdir, 'config_repo')
self._clone_repo(repodir, config['config_url'], config.get('config_branch', 'master'))
self._clone_repo(compose, repodir, config['config_url'], config.get('config_branch', 'master'))
comps_repo = compose.paths.work.comps_repo('$basearch', variant=variant, create_dir=False)
repos = shortcuts.force_list(config['repo']) + self.repos
@ -168,6 +168,6 @@ class OSTreeThread(WorkerThread):
mounts=mounts, new_chroot=True,
weight=compose.conf['runroot_weights'].get('ostree'))
def _clone_repo(self, repodir, url, branch):
def _clone_repo(self, compose, repodir, url, branch):
scm.get_dir_from_scm({'scm': 'git', 'repo': url, 'branch': branch, 'dir': '.'},
repodir, logger=self.pool._logger)
repodir, compose=compose)

6
pungi/phases/ostree_installer.py
View File

@ -97,7 +97,7 @@ class OstreeInstallerThread(WorkerThread):
util.makedirs(os.path.dirname(output_dir))
self.template_dir = os.path.join(compose.paths.work.topdir(arch), variant.uid, 'lorax_templates')
self._clone_templates(config.get('template_repo'), config.get('template_branch'))
self._clone_templates(compose, config.get('template_repo'), config.get('template_branch'))
disc_type = compose.conf['disc_types'].get('ostree', 'ostree')
volid = get_volid(compose, arch, variant, disc_type=disc_type)
@ -108,12 +108,12 @@ class OstreeInstallerThread(WorkerThread):
self._add_to_manifest(compose, variant, arch, filename)
self.pool.log_info('[DONE ] %s' % (msg))
def _clone_templates(self, url, branch='master'):
def _clone_templates(self, compose, url, branch='master'):
if not url:
self.template_dir = None
return
scm.get_dir_from_scm({'scm': 'git', 'repo': url, 'branch': branch, 'dir': '.'},
self.template_dir, logger=self.pool._logger)
self.template_dir, compose=compose)
def _get_release(self, compose, config):
if 'release' in config:

2
tests/test_ostree_installer_phase.py
View File

@ -437,7 +437,7 @@ class OstreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'git://example.com/templates.git',
'branch': 'f24', 'dir': '.'},
templ_dir, logger=pool._logger)])
templ_dir, compose=self.compose)])
self.assertRunrootCall(koji,
["http://example.com/repo/1",
'http://example.com/work/$basearch/comps_repo_Everything'],

10
tests/test_ostree_phase.py
View File

@ -130,7 +130,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
})
self.pool = mock.Mock()
def _dummy_config_repo(self, scm_dict, target, logger=None):
def _dummy_config_repo(self, scm_dict, target, compose=None):
os.makedirs(target)
helpers.touch(os.path.join(target, 'fedora-atomic-docker-host.json'),
json.dumps({'ref': 'fedora-atomic/25/x86_64',
@ -202,7 +202,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -371,7 +371,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -406,7 +406,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',
@ -441,7 +441,7 @@ class OSTreeThreadTest(helpers.PungiTestCase):
self.assertEqual(get_dir_from_scm.call_args_list,
[mock.call({'scm': 'git', 'repo': 'https://git.fedorahosted.org/git/fedora-atomic.git',
'branch': 'f24', 'dir': '.'},
self.topdir + '/work/ostree-1/config_repo', logger=self.pool._logger)])
self.topdir + '/work/ostree-1/config_repo', compose=self.compose)])
self.assertEqual(koji.get_runroot_cmd.call_args_list,
[mock.call('rrt', 'x86_64',
['pungi-make-ostree',