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

koji_wrapper: Always use --profile option with koji

Browse Source 
This patch adds this option to all invoked koji commands.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-01-30 12:56:10 +01:00
parent 42cdf047cc
commit 9533fca96c
3 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pungi/wrappers/kojiwrapper.py
View File

@ -31,8 +31,6 @@ class KojiWrapper(object):
def __init__(self, profile): def __init__(self, profile):
self.profile = profile self.profile = profile
# assumption: profile name equals executable name (it's a symlink -> koji)
self.executable = self.profile.replace("_", "-")
with self.lock: with self.lock:
self.koji_module = koji.get_profile_module(profile) self.koji_module = koji.get_profile_module(profile)
session_opts = {} session_opts = {}
@ -61,8 +59,11 @@ class KojiWrapper(object):
else: else:
raise RuntimeError('Unsupported authentication type in Koji') raise RuntimeError('Unsupported authentication type in Koji')
def _get_cmd(self, *args):
return ["koji", "--profile=%s" % self.profile] + list(args)
def get_runroot_cmd(self, target, arch, command, quiet=False, use_shell=True, channel=None, packages=None, mounts=None, weight=None, task_id=True, new_chroot=False): def get_runroot_cmd(self, target, arch, command, quiet=False, use_shell=True, channel=None, packages=None, mounts=None, weight=None, task_id=True, new_chroot=False):
cmd = [self.executable, "runroot"] cmd = self._get_cmd("runroot")
if quiet: if quiet:
cmd.append("--quiet") cmd.append("--quiet")
@ -155,7 +156,7 @@ class KojiWrapper(object):
cfg_parser.write(fd) cfg_parser.write(fd)
fd.close() fd.close()
cmd = [self.executable, sub_command, "--config=%s" % conf_file_dest] cmd = self._get_cmd(sub_command, "--config=%s" % conf_file_dest)
if wait: if wait:
cmd.append("--wait") cmd.append("--wait")
if scratch: if scratch:
@ -164,14 +165,8 @@ class KojiWrapper(object):
return cmd return cmd
def get_live_media_cmd(self, options, wait=True): def get_live_media_cmd(self, options, wait=True):
# Usage: koji --profile=<koji_profile> spin-livemedia [options] <name> <version> <target> <arch> <kickstart-file> # Usage: koji spin-livemedia [options] <name> <version> <target> <arch> <kickstart-file>
cmd = ['koji'] cmd = self._get_cmd('spin-livemedia')
if 'koji_profile' not in options:
raise ValueError('Expected options to have key "koji_profile"')
cmd.append('--profile=%s' % options['koji_profile'])
cmd.append('spin-livemedia')
for key in ('name', 'version', 'target', 'arch', 'ksfile'): for key in ('name', 'version', 'target', 'arch', 'ksfile'):
if key not in options: if key not in options:
@ -216,7 +211,7 @@ class KojiWrapper(object):
# * version: YYYYMMDD[.n|.t].X # * version: YYYYMMDD[.n|.t].X
# * release: 1 # * release: 1
cmd = [self.executable] cmd = self._get_cmd()
if image_type == "live": if image_type == "live":
cmd.append("spin-livecd") cmd.append("spin-livecd")
@ -281,7 +276,7 @@ class KojiWrapper(object):
"""Tries to wait for a task to finish. On connection error it will """Tries to wait for a task to finish. On connection error it will
retry with `watch-task` command. retry with `watch-task` command.
""" """
cmd = [self.executable, 'watch-task', str(task_id)] cmd = self._get_cmd('watch-task', str(task_id))
attempt = 0 attempt = 0
while True: while True:

65
tests/test_koji_wrapper.py
View File

@ -46,7 +46,7 @@ class KojiWrapperBaseTestCase(unittest.TestCase):
class KojiWrapperTest(KojiWrapperBaseTestCase): class KojiWrapperTest(KojiWrapperBaseTestCase):
def test_krb_login_krb(self): def test_krb_login_krb(self):
self.assertEquals(self.koji.koji_module.config.krb_rdns, False) self.assertEqual(self.koji.koji_module.config.krb_rdns, False)
self.koji.login() self.koji.login()
self.koji.koji_proxy.krb_login.assert_called_with('testprincipal', self.koji.koji_proxy.krb_login.assert_called_with('testprincipal',
'testkeytab') 'testkeytab')
@ -81,9 +81,8 @@ class KojiWrapperTest(KojiWrapperBaseTestCase):
self.tmpfile self.tmpfile
) )
self.assertEqual(cmd[0], 'custom-koji') self.assertEqual(cmd[:3], ['koji', '--profile=custom-koji', 'image-build'])
self.assertEqual(cmd[1], 'image-build') self.assertItemsEqual(cmd[3:],
self.assertItemsEqual(cmd[2:],
['--config=' + self.tmpfile, '--wait']) ['--config=' + self.tmpfile, '--wait'])
with open(self.tmpfile, 'r') as f: with open(self.tmpfile, 'r') as f:
@ -284,11 +283,11 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
def test_get_live_media_cmd_minimal(self): def test_get_live_media_cmd_minimal(self):
opts = { opts = {
'name': 'name', 'version': '1', 'target': 'tgt', 'arch': 'x,y,z', 'name': 'name', 'version': '1', 'target': 'tgt', 'arch': 'x,y,z',
'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'koji_profile': 'koji', 'ksfile': 'kickstart', 'install_tree': '/mnt/os',
} }
cmd = self.koji.get_live_media_cmd(opts) cmd = self.koji.get_live_media_cmd(opts)
self.assertEqual(cmd, self.assertEqual(cmd,
['koji', '--profile=koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart', ['koji', '--profile=custom-koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart',
'--install-tree=/mnt/os', '--wait']) '--install-tree=/mnt/os', '--wait'])
def test_get_live_media_cmd_full(self): def test_get_live_media_cmd_full(self):
@ -297,11 +296,10 @@ class LiveMediaTestCase(KojiWrapperBaseTestCase):
'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'scratch': True, 'ksfile': 'kickstart', 'install_tree': '/mnt/os', 'scratch': True,
'repo': ['repo-1', 'repo-2'], 'skip_tag': True, 'repo': ['repo-1', 'repo-2'], 'skip_tag': True,
'ksurl': 'git://example.com/ksurl.git', 'release': '20160222.1', 'ksurl': 'git://example.com/ksurl.git', 'release': '20160222.1',
'koji_profile': 'koji',
} }
cmd = self.koji.get_live_media_cmd(opts) cmd = self.koji.get_live_media_cmd(opts)
self.assertEqual(cmd[:9], self.assertEqual(cmd[:9],
['koji', '--profile=koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart', ['koji', '--profile=custom-koji', 'spin-livemedia', 'name', '1', 'tgt', 'x,y,z', 'kickstart',
'--install-tree=/mnt/os']) '--install-tree=/mnt/os'])
self.assertItemsEqual(cmd[9:], self.assertItemsEqual(cmd[9:],
['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait', ['--repo=repo-1', '--repo=repo-2', '--skip-tag', '--scratch', '--wait',
@ -312,18 +310,18 @@ class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):
def test_get_create_image_cmd_minimal(self): def test_get_create_image_cmd_minimal(self):
cmd = self.koji.get_create_image_cmd('my_name', '1.0', 'f24-candidate', cmd = self.koji.get_create_image_cmd('my_name', '1.0', 'f24-candidate',
'x86_64', '/path/to/ks', ['/repo/1']) 'x86_64', '/path/to/ks', ['/repo/1'])
self.assertEqual(cmd[0:2], ['custom-koji', 'spin-livecd']) self.assertEqual(cmd[0:3], ['koji', '--profile=custom-koji', 'spin-livecd'])
self.assertItemsEqual(cmd[2:6], ['--noprogress', '--scratch', '--wait', '--repo=/repo/1']) self.assertItemsEqual(cmd[3:7], ['--noprogress', '--scratch', '--wait', '--repo=/repo/1'])
self.assertEqual(cmd[6:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks']) self.assertEqual(cmd[7:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks'])
def test_get_create_image_cmd_full(self): def test_get_create_image_cmd_full(self):
cmd = self.koji.get_create_image_cmd('my_name', '1.0', 'f24-candidate', cmd = self.koji.get_create_image_cmd('my_name', '1.0', 'f24-candidate',
'x86_64', '/path/to/ks', ['/repo/1', '/repo/2'], 'x86_64', '/path/to/ks', ['/repo/1', '/repo/2'],
release='1', wait=False, archive=True, specfile='foo.spec', release='1', wait=False, archive=True, specfile='foo.spec',
ksurl='https://git.example.com/') ksurl='https://git.example.com/')
self.assertEqual(cmd[0:2], ['custom-koji', 'spin-livecd']) self.assertEqual(cmd[0:3], ['koji', '--profile=custom-koji', 'spin-livecd'])
self.assertEqual(cmd[-5:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks']) self.assertEqual(cmd[-5:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks'])
self.assertItemsEqual(cmd[2:-5], self.assertItemsEqual(cmd[3:-5],
['--noprogress', '--nowait', '--repo=/repo/1', '--repo=/repo/2', ['--noprogress', '--nowait', '--repo=/repo/1', '--repo=/repo/2',
'--release=1', '--specfile=foo.spec', '--ksurl=https://git.example.com/']) '--release=1', '--specfile=foo.spec', '--ksurl=https://git.example.com/'])
@ -338,9 +336,9 @@ class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):
'x86_64', '/path/to/ks', [], 'x86_64', '/path/to/ks', [],
image_type='appliance', image_type='appliance',
image_format='qcow') image_format='qcow')
self.assertEqual(cmd[0:2], ['custom-koji', 'spin-appliance']) self.assertEqual(cmd[0:3], ['koji', '--profile=custom-koji', 'spin-appliance'])
self.assertItemsEqual(cmd[2:6], ['--noprogress', '--scratch', '--wait', '--format=qcow']) self.assertItemsEqual(cmd[3:7], ['--noprogress', '--scratch', '--wait', '--format=qcow'])
self.assertEqual(cmd[6:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks']) self.assertEqual(cmd[7:], ['my_name', '1.0', 'f24-candidate', 'x86_64', '/path/to/ks'])
def test_spin_appliance_with_wrong_format(self): def test_spin_appliance_with_wrong_format(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
@ -353,13 +351,12 @@ class LiveImageKojiWrapperTest(KojiWrapperBaseTestCase):
class RunrootKojiWrapperTest(KojiWrapperBaseTestCase): class RunrootKojiWrapperTest(KojiWrapperBaseTestCase):
def test_get_cmd_minimal(self): def test_get_cmd_minimal(self):
cmd = self.koji.get_runroot_cmd('tgt', 's390x', 'date', use_shell=False, task_id=False) cmd = self.koji.get_runroot_cmd('tgt', 's390x', 'date', use_shell=False, task_id=False)
self.assertEqual(len(cmd), 6) self.assertEqual(len(cmd), 7)
self.assertEqual(cmd[0], 'custom-koji') self.assertEqual(cmd[:3], ['koji', '--profile=custom-koji', 'runroot'])
self.assertEqual(cmd[1], 'runroot')
self.assertEqual(cmd[-3], 'tgt') self.assertEqual(cmd[-3], 'tgt')
self.assertEqual(cmd[-2], 's390x') self.assertEqual(cmd[-2], 's390x')
self.assertEqual(cmd[-1], 'rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; date') self.assertEqual(cmd[-1], 'rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; date')
self.assertItemsEqual(cmd[2:-3], self.assertItemsEqual(cmd[3:-3],
['--channel-override=runroot-local']) ['--channel-override=runroot-local'])
def test_get_cmd_full(self): def test_get_cmd_full(self):
@ -367,13 +364,12 @@ class RunrootKojiWrapperTest(KojiWrapperBaseTestCase):
quiet=True, channel='chan', quiet=True, channel='chan',
packages=['strace', 'lorax'], packages=['strace', 'lorax'],
mounts=['/tmp'], weight=1000) mounts=['/tmp'], weight=1000)
self.assertEqual(len(cmd), 13) self.assertEqual(len(cmd), 14)
self.assertEqual(cmd[0], 'custom-koji') self.assertEqual(cmd[:3], ['koji', '--profile=custom-koji', 'runroot'])
self.assertEqual(cmd[1], 'runroot')
self.assertEqual(cmd[-3], 'tgt') self.assertEqual(cmd[-3], 'tgt')
self.assertEqual(cmd[-2], 's390x') self.assertEqual(cmd[-2], 's390x')
self.assertEqual(cmd[-1], 'rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; /bin/echo \'&\'') self.assertEqual(cmd[-1], 'rm -f /var/lib/rpm/__db*; rm -rf /var/cache/yum/*; set -x; /bin/echo \'&\'')
self.assertItemsEqual(cmd[2:-3], self.assertItemsEqual(cmd[3:-3],
['--channel-override=chan', '--quiet', '--use-shell', ['--channel-override=chan', '--quiet', '--use-shell',
'--task-id', '--weight=1000', '--package=strace', '--task-id', '--weight=1000', '--package=strace',
'--package=lorax', '--mount=/tmp']) '--package=lorax', '--mount=/tmp'])
@ -472,7 +468,8 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234}) self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234})
self.assertEqual(run.mock_calls, self.assertEqual(run.mock_calls,
[mock.call('cmd', can_fail=True, logfile=None), [mock.call('cmd', can_fail=True, logfile=None),
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None)]) mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
can_fail=True, logfile=None)])
@mock.patch('pungi.wrappers.kojiwrapper.run') @mock.patch('pungi.wrappers.kojiwrapper.run')
def test_disconnect_and_retry_but_fail(self, run): def test_disconnect_and_retry_but_fail(self, run):
@ -485,7 +482,8 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
self.assertDictEqual(result, {'retcode': 1, 'output': retry, 'task_id': 1234}) self.assertDictEqual(result, {'retcode': 1, 'output': retry, 'task_id': 1234})
self.assertEqual(run.mock_calls, self.assertEqual(run.mock_calls,
[mock.call('cmd', can_fail=True, logfile=None), [mock.call('cmd', can_fail=True, logfile=None),
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None)]) mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
can_fail=True, logfile=None)])
@mock.patch('time.sleep') @mock.patch('time.sleep')
@mock.patch('pungi.wrappers.kojiwrapper.run') @mock.patch('pungi.wrappers.kojiwrapper.run')
@ -499,9 +497,12 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234}) self.assertDictEqual(result, {'retcode': 0, 'output': retry, 'task_id': 1234})
self.assertEqual(run.mock_calls, self.assertEqual(run.mock_calls,
[mock.call('cmd', can_fail=True, logfile=None), [mock.call('cmd', can_fail=True, logfile=None),
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None), mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None), can_fail=True, logfile=None),
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None)]) mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
can_fail=True, logfile=None),
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
can_fail=True, logfile=None)])
self.assertEqual(sleep.mock_calls, self.assertEqual(sleep.mock_calls,
[mock.call(i * 10) for i in range(1, 3)]) [mock.call(i * 10) for i in range(1, 3)])
@ -517,8 +518,10 @@ class RunBlockingCmdTest(KojiWrapperBaseTestCase):
self.assertIn('Failed to wait', str(ctx.exception)) self.assertIn('Failed to wait', str(ctx.exception))
self.assertEqual(run.mock_calls, self.assertEqual(run.mock_calls,
[mock.call('cmd', can_fail=True, logfile=None), [mock.call('cmd', can_fail=True, logfile=None),
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None), mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
mock.call(['custom-koji', 'watch-task', '1234'], can_fail=True, logfile=None)]) can_fail=True, logfile=None),
mock.call(['koji', '--profile=custom-koji', 'watch-task', '1234'],
can_fail=True, logfile=None)])
self.assertEqual(sleep.mock_calls, [mock.call(i * 10) for i in range(1, 2)]) self.assertEqual(sleep.mock_calls, [mock.call(i * 10) for i in range(1, 2)])

3
tests/test_livemediaphase.py
View File

@ -380,8 +380,7 @@ class TestLiveMediaPhase(PungiTestCase):
'failable': ['*'], 'failable': ['*'],
} }
] ]
}, }
'koji_profile': 'koji',
}) })
compose.setup_optional() compose.setup_optional()