From 07a3f36526f366003979f93594b37bfda1636fa8 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 21 Oct 2015 14:23:06 +0200
Subject: [PATCH] contrib/rh-bkr: use $ARCH variable to select host-type

---
 contrib/rh-bkr/bkr.py    | 10 ++++++++++
 contrib/rh-bkr/job01.xml |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py
index 7de88f5ae7..5647e7e6d1 100755
--- a/contrib/rh-bkr/bkr.py
+++ b/contrib/rh-bkr/bkr.py
@@ -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',
diff --git a/contrib/rh-bkr/job01.xml b/contrib/rh-bkr/job01.xml
index 1e9e8c2508..76d270e801 100644
--- a/contrib/rh-bkr/job01.xml
+++ b/contrib/rh-bkr/job01.xml
@@ -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"/> -->