From 0f3d511322f9b352f2ee78e438d57ec56b5d1cd5 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 9 Nov 2015 12:06:31 +0100
Subject: Use RTT_ACCEPTED tag

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

diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py
index 7de88f5ae7..422716ee9a 100755
--- a/contrib/rh-bkr/bkr.py
+++ b/contrib/rh-bkr/bkr.py
@@ -734,18 +734,18 @@ class CmdSubmit(CmdBase):
     def _process_line_get_GIT_TARGETBRANCH(self, key, replacement, index=None, none=None):
         return self.__process_line_get_GIT_TARGETBRANCH_detect("GIT_TARGETBRANCH")
 
-    def _process_line_get_DISTRO_NAME(self, key, replacement, index=None, none=None):
-        v = self._get_default('DISTO_NAME')
+    def _process_line_get_DISTRO_TAG(self, key, replacement, index=None, none=None):
+        v = self._get_default('DISTO_TAG')
         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_TAG")
         if target_branch == 'rhel-7.0':
-            return 'RHEL-7.0-20140507.0'
+            return 'RHEL-7_0-Z-branch'
         if target_branch == 'rhel-7.1':
-            return 'RHEL-7.1-20141023.n.1'
+            return 'RHEL-7_1-Z-branch'
         if target_branch == 'rhel-7':
             pass
-        return 'RHEL-7.2-20150907.n.0'
+        return 'RTT_ACCEPTED'
 
     def _process_line_get_RESERVESYS(self, key, replacement, index=None, none=None):
         v = self._get_default('RESERVESYS')
@@ -767,7 +767,7 @@ class CmdSubmit(CmdBase):
             'WHITEBOARD'        : 'Test NetworkManager',
             'DISTRO_FAMILY'     : 'RedHatEnterpriseLinux7',
             'DISTRO_VARIANT'    : 'Workstation',
-            'DISTRO_NAME'       : _process_line_get_DISTRO_NAME,
+            'DISTRO_TAG'        : _process_line_get_DISTRO_TAG,
             'DISTRO_METHOD'     : 'nfs',
             'DISTRO_ARCH'       : 'x86_64',
             'HOSTREQUIRES'      : _process_line_get_HOSTREQUIRES,
diff --git a/contrib/rh-bkr/job01.xml b/contrib/rh-bkr/job01.xml
index 1e9e8c2508..826cb3008d 100644
--- a/contrib/rh-bkr/job01.xml
+++ b/contrib/rh-bkr/job01.xml
@@ -59,8 +59,8 @@ rm -f /etc/sysconfig/network-scripts/ifcfg-mlx*
 			<repos/>
 			<distroRequires>
 				<and>
-					<!--<distro_family op="=" value="$DISTRO_FAMILY"/>-->
-					<distro_name op="=" value="$DISTRO_NAME"/>
+					<distro_family op="=" value="$DISTRO_FAMILY"/>
+					<distro_tag op="=" value="$DISTRO_TAG"/>
 					<distro_variant op="=" value="$DISTRO_VARIANT"/>
 					<distro_method op="=" value="$DISTRO_METHOD"/>
 					<distro_arch op="=" value="$DISTRO_ARCH"/>
-- 
cgit v1.2.1