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

contrib/bkr: add option to selinux=0

Browse source
This commit is contained in:
Thomas Haller 2015-04-17 17:47:02 +02:00
parent cfb5a50968
commit aae4d65d7c
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -477,6 +477,7 @@ class CmdSubmit(CmdBase):
self.parser.add_argument('--job', '-j', help='beaker xml job file')
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')
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')
self.parser.add_argument('--hosttype', help='The host type. Known values are \'veth\', \'dcb\', \'infiniband\', and \'wifi\'. Anything else uses the default. This determines the $HOSTREQUIRES template')
self.parser.add_argument('--jobtype', help='The job type. Known values are \'rhel70\'. Anything else uses the default to create a retention=scratch job. This determines the $JOBTYPE template')
@ -640,6 +641,14 @@ class CmdSubmit(CmdBase):
return ""
return '<reservesys duration="86400"/>'
def _process_line_get_SELINUX_DISABLED(self, key, replacement, index=None, none=None):
v = self._get_default('SELINUX_DISABLED')
if v is not None:
return v
if self.options.disable_selinux:
return 'selinux=0'
return ''
DefaultReplacements = {
'WHITEBOARD' : 'Test NetworkManager',
'DISTRO_FAMILY' : 'RedHatEnterpriseLinux7',
@ -653,6 +662,7 @@ class CmdSubmit(CmdBase):
'GIT_TARGETBRANCH' : _process_line_get_GIT_TARGETBRANCH,
'UUID' : str(uuid.uuid4()),
'RESERVESYS' : _process_line_get_RESERVESYS,
'SELINUX_DISABLED' : _process_line_get_SELINUX_DISABLED,
}
def _process_line_get(self, key, replacement, index=None, none=None):
if key in replacement:

2
contrib/rh-bkr/job01.xml
View file

@ -4,7 +4,7 @@
$ARGV $ARGV_PROFILE
</whiteboard>
<recipeSet priority="Normal">
<recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="$WHITEBOARD $UUID">
<recipe kernel_options="$SELINUX_DISABLED" kernel_options_post="" ks_meta="" role="None" whiteboard="$WHITEBOARD $UUID">
<autopick random="true"/>
<watchdog panic="None"/>
<packages/>