From 966523468d885fcfbeb73ea356fbb64cc6fc1899 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 15 Apr 2014 15:51:13 +0200
Subject: [PATCH] contrib/bkr: update job template

Signed-off-by: Thomas Haller <thaller@redhat.com>
---
 contrib/rh-bkr/bkr.py    |  2 +-
 contrib/rh-bkr/job01.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py
index 97b7543a47..0405379caa 100755
--- a/contrib/rh-bkr/bkr.py
+++ b/contrib/rh-bkr/bkr.py
@@ -217,7 +217,7 @@ class CmdSubmit(CmdBase):
             'WHITEBOARD'        : 'Test NetworkManager',
             'DISTRO_FAMILY'     : 'RedHatEnterpriseLinux7',
             'DISTRO_VARIANT'    : 'Workstation',
-            'DISTRO_NAME'       : 'RHEL-7.0-20140224.n.0',
+            'DISTRO_NAME'       : 'RHEL-7.0-20140408.n.0',
             'DISTRO_METHOD'     : 'nfs',
             'DISTRO_ARCH'       : 'x86_64',
             '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 9bc773dbaa..e0c4f90ac2 100644
--- a/contrib/rh-bkr/job01.xml
+++ b/contrib/rh-bkr/job01.xml
@@ -2,9 +2,9 @@
 	<whiteboard>
 		$WHITEBOARD $UUID
 	</whiteboard>
-	<recipeSet priority="High">
-		<recipe kernel_options="" kernel_options_post="" ks_meta="method=nfs" role="None" whiteboard="">
-			<autopick random="false"/>
+	<recipeSet priority="Normal">
+		<recipe kernel_options="" kernel_options_post="" ks_meta="method=nfs" role="None" whiteboard="$WHITEBOARD $UUID">
+			<autopick random="true"/>
 			<watchdog panic="None"/>
 			<packages/>
 			<ks_appends/>
@@ -20,8 +20,8 @@
 			</distroRequires>
 			<hostRequires>
 				<and>
-					<group op="=" value="desktopqe-net"/>
 					<arch op="=" value="x86_64"/>
+					<group op="=" value="desktopqe-net"/>
 					<!--<hostname op="=" value="qe-dell-ovs5-vm-2.dqe.lab.eng.bos.redhat.com"/>-->
 				</and>
 				<system_type value="Machine"/>
@@ -29,7 +29,7 @@
 			<partitions/>
 			<task name="/distribution/pkginstall" role="STANDALONE">
 				<params>
-					<param name="PKGARGNAME" value="python-setuptools pexpect bash-completion iw net-tools teamd NetworkManager wireshark"/>
+					<param name="PKGARGNAME" value="python-setuptools pexpect bash-completion iw net-tools teamd NetworkManager radvd wireshark"/>
 				</params>
 			</task>
 			<task name="/distribution/command" role="STANDALONE">
@@ -49,12 +49,12 @@
 			</task>
 			<task name="/qe/desktop/simpletestharness_dev" role="STANDALONE">
 				<params>
-					<param name="COMPONENT" value="NetworkManager"/>
-					<param name="TESTS" value="$TESTS"/>
 					<param name="GIT_TARGETBRANCH" value="rhel-7"/>
+					<param name="TESTS" value="$TESTS"/>
+					<param name="TEST_MAPPER" value="True"/>
+					<param name="COMPONENT" value="NetworkManager"/>
 					<param name="GIT_URL" value="https://gerrit.dqe.lab.eng.bos.redhat.com/cgit/NetworkManager.git"/>
 					<param name="TYPE" value="TEST"/>
-					<param name="TEST_MAPPER" value="True"/>
 				</params>
 			</task>
 			<task name="/distribution/command" role="STANDALONE">