fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-04 20:00:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/bkr: allow specifying the jobtype and create "scratch" jobs by default

Browse source 
Add a new paramter --jobtype to bkr.py
This commit is contained in:
Thomas Haller 2014-12-03 12:45:34 +01:00
parent 233f3699d0
commit 0353b5a740
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -479,6 +479,7 @@ class CmdSubmit(CmdBase):
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('--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):
if self.options.rpm is None:
@ -582,6 +583,15 @@ class CmdSubmit(CmdBase):
def _detect_hosttype(self):
return 'default'
def _process_line_get_JOBTYPE(self, key, replacement, index=None, none=None):
v = self._get_default('JOBTYPE')
if v is not None:
return v;
jobtype = self.options.jobtype
if jobtype == 'rhel70':
return 'product="cpe:/o:redhat:enterprise_linux:7.0" retention_tag="active+1"'
return 'retention_tag="scratch"'
def _process_line_get_HOSTREQUIRES(self, key, replacement, index=None, none=None):
v = self._get_default('HOSTREQUIRES')
if v is not None:
@ -625,6 +635,7 @@ class CmdSubmit(CmdBase):
'DISTRO_METHOD' : 'nfs',
'DISTRO_ARCH' : 'x86_64',
'HOSTREQUIRES' : _process_line_get_HOSTREQUIRES,
'JOBTYPE' : _process_line_get_JOBTYPE,
'TEST_URL' : 'http://download.eng.brq.redhat.com/scratch/vbenes/NetworkManager-rhel-7.tar.gz',
'GIT_TARGETBRANCH' : _process_line_get_GIT_TARGETBRANCH,
'UUID' : str(uuid.uuid4()),

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

@ -1,4 +1,4 @@
<job product="cpe:/o:redhat:enterprise_linux:7.0" retention_tag="active+1">
<job $JOBTYPE>
<whiteboard>
$WHITEBOARD $UUID
$ARGV