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

contrib/bkr: update default job template and GIT_TARGETBRANCH detection

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-08-04 11:38:56 +02:00
parent 2a3a5a873d
commit 9208280370
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -341,7 +341,7 @@ class UploadFile_ParseWebsite(UploadFile):
self._urls = None
UploadFile.__init__(self, uri)
DefaultPattern = '^.*/NetworkManager(-adsl|-bluetooth|-debuginfo|-devel|-glib|-glib-devel|-team|-tui|-wifi|-wwan)?-[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[^ /]*\.x86_64\.rpm$'
DefaultPattern = '^.*/NetworkManager(-adsl|-bluetooth|-config-connectivity-fedora|-debuginfo|-devel|-glib|-glib-devel|-libnm|-libnm-devel|-team|-tui|-wifi|-wwan)?-[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[^ /]*\.x86_64\.rpm$'
@property
def pattern(self):
if self._pattern is not None:
@ -541,9 +541,15 @@ class CmdSubmit(CmdBase):
if self.rpm is not None:
for x in self.rpm:
for u in x[1].url():
if re.match(r'^.*/NetworkManager-0.9.9.1-[1-9][0-9]*.git20140326.4dba720.el7[^/]*$', u):
return 'rhel-7'
return 'master'
if re.match(r'^.*/NetworkManager-0.9.9.1-[1-9][0-9]*\.git20140326\.4dba720\.el7\.x86_64\.rpm$', u):
return 'rhel-7.0' # stable rhel-7.0 release
if re.match(r'^.*/NetworkManager-0.9.11.0-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u):
return 'master' # current development, pre 1.0
if re.match(r'^.*/NetworkManager-0.9.10.[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u):
return 'master' # 0.9.10
if re.match(r'^.*/NetworkManager-0.9.9.9[0-9]+-[0-9]+\.[a-f0-9]+\.el7.x86_64.rpm$', u):
return 'master' # 0.9.10-rc
raise Exception("could not detect GIT_TARGETBRANCH. Try setting as environment variable")
DefaultReplacements = {
'WHITEBOARD' : 'Test NetworkManager',

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

@ -4,7 +4,7 @@
$ARGV
</whiteboard>
<recipeSet priority="Normal">
<recipe kernel_options="" kernel_options_post="" ks_meta="method=nfs" role="None" whiteboard="$WHITEBOARD $UUID">
<recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="$WHITEBOARD $UUID">
<autopick random="true"/>
<watchdog panic="None"/>
<packages/>
@ -67,7 +67,7 @@
<param name="TESTS" value="$TESTS"/>
<param name="TEST_MAPPER" value="True"/>
<param name="COMPONENT" value="NetworkManager"/>
<param name="GIT_URL" value="http://git.app.eng.bos.redhat.com/git/desktopqe/NetworkManager.git"/>
<param name="GIT_URL" value="http://code.engineering.redhat.com/gerrit/desktopqe/NetworkManager"/>
<param name="TYPE" value="TEST"/>
</params>
</task>