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

contrib/rh-bkr: use $ARCH variable to select host-type

Browse source
This commit is contained in:
Thomas Haller 2015-10-21 14:23:06 +02:00
parent 075edacd9b
commit 07a3f36526
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -755,6 +755,15 @@ class CmdSubmit(CmdBase):
return ""
return '<reservesys duration="86400"/>'
def _process_line_get_ARCH(self, key, replacement, index=None, none=None):
v = self._get_default('ARCH')
if v is not None:
return v
v = self._get_default('DISTRO_ARCH')
if v is not None:
return v
return 'x86_64'
def _process_line_get_SELINUX_DISABLED(self, key, replacement, index=None, none=None):
v = self._get_default('SELINUX_DISABLED')
if v is not None:
@ -770,6 +779,7 @@ class CmdSubmit(CmdBase):
'DISTRO_NAME' : _process_line_get_DISTRO_NAME,
'DISTRO_METHOD' : 'nfs',
'DISTRO_ARCH' : 'x86_64',
'ARCH' : _process_line_get_ARCH,
'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',

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

@ -63,12 +63,12 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-mlx*
<distro_name op="=" value="$DISTRO_NAME"/>
<distro_variant op="=" value="$DISTRO_VARIANT"/>
<distro_method op="=" value="$DISTRO_METHOD"/>
<distro_arch op="=" value="$DISTRO_ARCH"/>
<distro_arch op="=" value="$ARCH"/>
</and>
</distroRequires>
<hostRequires>
<and>
<arch op="=" value="x86_64"/>
<arch op="=" value="$ARCH"/>
<!-- default --> <!-- <group op="=" value="desktopqe-net"/> -->
<!-- veth --> <!-- <group op="=" value="desktop"/> -->
<!-- dcb --> <!-- <hostname op="=" value="wsfd-netdev7.lab.bos.redhat.com"/> -->