fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 06:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/bkr: support new --jobtype veth

Browse source
This commit is contained in:
Thomas Haller 2014-12-19 16:21:12 +01:00
parent 07947f5bbe
commit 3f8f10c93c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -478,7 +478,7 @@ class CmdSubmit(CmdBase):
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('--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 \'dcb\', \'infiniband\', and \'wifi\'. Anything else uses the default. This determines the $HOSTREQUIRES template')
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')
def _prepare_rpms(self):
@ -599,7 +599,9 @@ class CmdSubmit(CmdBase):
if v is not None:
return v;
hosttype = self.options.hosttype
if hosttype == 'dcb':
if hosttype == 'veth':
return '<group op="=" value="desktop"/>'
elif hosttype == 'dcb':
return '<hostname op="=" value="wsfd-netdev7.lab.bos.redhat.com"/>'
elif hosttype == 'infiniband':
return '<hostname op="=" value="rdma-qe-11.lab.bos.redhat.com"/>'

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

@ -23,6 +23,7 @@
<and>
<arch op="=" value="x86_64"/>
<!-- default --> <!-- <group op="=" value="desktopqe-net"/> -->
<!-- veth --> <!-- <group op="=" value="desktop"/> -->
<!-- dcb --> <!-- <hostname op="=" value="wsfd-netdev7.lab.bos.redhat.com"/> -->
<!-- infiniband --> <!-- <hostname op="=" value="rdma-qe-11.lab.bos.redhat.com"/> -->
<!-- wifi --> <!-- <group op="=" value="wireless"/><hostname op="like" value="wlan-r2%.wlan.rhts.eng.bos.redhat.com"/> -->