fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 07:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/rh-bkr: default to using the old reservesys task

Browse source 
The new one doesn't support returning or extending. It can still be used with
--reservesys=new.

Revert "contrib/bkr: update specifying reservesys"
This reverts commit 96f49913c4.
This commit is contained in:
Lubomir Rintel 2015-12-16 16:42:30 +01:00
parent 12728813b6
commit 0ac16a0d3f
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
contrib/rh-bkr/bkr.py
View file

@ -538,7 +538,7 @@ class CmdSubmit(CmdBase):
self.parser.add_argument('--job', '-j', help='beaker xml job file')
self.parser.add_argument('--job-default', '-J', action='store_true', help='Use default job file. Only has effect if --job is not specified')
self.parser.add_argument('--verbose', '-v', action='count', help='print more information')
self.parser.add_argument('--reservesys', '-R', action='store_true', help='add task /distribution/reservesys (same as --reservesys-time=86400')
self.parser.add_argument('--reservesys', '-R', nargs='?', choices=['if_fail', 'new'], default=argparse.SUPPRESS, help='add task /distribution/reservesys (same as --reservesys-time=86400')
self.parser.add_argument('--reservesys-time', help='add task /distribution/reservesys with a duration in second')
self.parser.add_argument('--disable-selinux', action='store_true', help='add kernel option selinux=0 to disable AVC checks ($SELINUX_DISABLED)')
self.parser.add_argument('--var', '-V', action='append', help='Set template replacements (alternative to setting via environment variables')
@ -793,14 +793,21 @@ class CmdSubmit(CmdBase):
v = self._get_var('RESERVESYS')
if v is not None:
return v
duration = self._get_var('RESERVE')
if self.options.reservesys:
duration = '86400'
if self.options.reservesys_time:
duration = self.options.reservesys_time
if not duration:
if not hasattr (self.options, 'reservesys'):
return ""
return '<reservesys duration="%s"/>' % (duration)
elif self.options.reservesys == "new":
if not duration:
duration = '86400'
return '<reservesys duration="%s"/>' % (duration)
else:
return '<task name="/distribution/reservesys" role="STANDALONE"><params>%s%s</params></task>' % (
('<param name="RESERVETIME" value="%d" />' % (duration) if duration else ''),
('<param name="RESERVE_IF_FAIL" value="True" />'if self.options.reservesys == "if_fail" else ''));
def _get_var_for_ARCH(self, key):
v = self._get_var('ARCH')