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

contrib/bkr: fix detection of GIT_TARGETBRANCH for new rhel-7.1 builds

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-10-23 16:48:00 +02:00
parent 41c9e91baf
commit d40fd6e2fe
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -545,6 +545,9 @@ class CmdSubmit(CmdBase):
def __process_line_get_GIT_TARGETBRANCH_detect(self, key_name): def __process_line_get_GIT_TARGETBRANCH_detect(self, key_name):
# we default to 'master', unless there is an RPM that looks like it's from # we default to 'master', unless there is an RPM that looks like it's from
# rhel-7.0. # rhel-7.0.
v = os.environ.get('GIT_TARGETBRANCH')
if v is not None:
return v
if self.rpm is not None: if self.rpm is not None:
for x in self.rpm: for x in self.rpm:
for u in x[1].url(): for u in x[1].url():
@ -556,18 +559,27 @@ class CmdSubmit(CmdBase):
return 'master' # 0.9.10 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): 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 return 'master' # 0.9.10-rc
raise Exception("could not detect %s. Try setting as environment variable" % (key_name)) if re.match(r'^.*/NetworkManager-0\.9\.11\..*\.git20141022.e28ee14.el7.x86_64.rpm$', u):
return 'master' # rhel-7.1-rc
raise Exception("could not detect the target branch. Try setting as environment variable GIT_TARGETBRANCH%s" % (
((" (or try setting "+key_name+")") if key_name == 'GIT_TARGETBRANCH' else '')))
def _process_line_get_GIT_TARGETBRANCH(self, key, replacement, index=None, none=None): def _process_line_get_GIT_TARGETBRANCH(self, key, replacement, index=None, none=None):
return self.__process_line_get_GIT_TARGETBRANCH_detect("GIT_TARGETBRANCH") return self.__process_line_get_GIT_TARGETBRANCH_detect("GIT_TARGETBRANCH")
def _process_line_get_DISTRO_NAME(self, key, replacement, index=None, none=None): def _process_line_get_DISTRO_NAME(self, key, replacement, index=None, none=None):
v = os.environ.get('DISTO_NAME')
if v is not None:
return v
target_branch = self.__process_line_get_GIT_TARGETBRANCH_detect("DISTRO_NAME") target_branch = self.__process_line_get_GIT_TARGETBRANCH_detect("DISTRO_NAME")
if target_branch == 'rhel-7.0': if target_branch == 'rhel-7.0':
return 'RHEL-7.0-20140507.0' return 'RHEL-7.0-20140507.0'
return 'RHEL-7.1-20140925.n.0' return 'RHEL-7.1-20141023.n.1'
def _process_line_get_RESERVESYS(self, key, replacement, index=None, none=None): def _process_line_get_RESERVESYS(self, key, replacement, index=None, none=None):
v = os.environ.get('RESERVESYS')
if v is not None:
return v
if not self.options.reservesys: if not self.options.reservesys:
return "" return ""
return '<task name="/distribution/reservesys" role="STANDALONE"/>' return '<task name="/distribution/reservesys" role="STANDALONE"/>'

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

@ -43,7 +43,7 @@
</task> </task>
<task name="/distribution/pkginstall" role="STANDALONE"> <task name="/distribution/pkginstall" role="STANDALONE">
<params> <params>
<param name="PKGARGNAME" value="python-setuptools pexpect bash-completion iw net-tools teamd NetworkManager radvd wireshark git firewalld"/> <param name="PKGARGNAME" value="python-setuptools pexpect bash-completion iw net-tools teamd NetworkManager radvd wireshark git firewalld psmisc bridge-utils"/>
</params> </params>
</task> </task>
<task name="/distribution/command" role="STANDALONE"> <task name="/distribution/command" role="STANDALONE">