From 0993db65831d8b8e8b13dc81f00db72b414ddf70 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 30 Jul 2015 16:22:51 +0000
Subject: [PATCH] Label jenkins slaves

---
 inventory/group_vars/jenkins-dev                   | 5 ++++-
 roles/jenkins/master/templates/slave-config.xml.j2 | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/inventory/group_vars/jenkins-dev b/inventory/group_vars/jenkins-dev
index 934b949a43..498f20ac64 100644
--- a/inventory/group_vars/jenkins-dev
+++ b/inventory/group_vars/jenkins-dev
@@ -6,12 +6,15 @@ slaves:
 - name: EL6
   host: jenkins-slave-el6.fedorainfracloud.org
   description: CentOS 6.6
+  labels: el centos centos6
 - name: EL7
   host: jenkins-slave-el7.fedorainfracloud.org
-  description: CentOS 7.0
+  description: Red Hat Enterprise Linux Server 7.1
+  labels: el rhel rhel7
 - name: F22
   host: jenkins-slave-f22.fedorainfracloud.org
   description: Fedora 22
+  labels: fedora fedora22
 
 # Packages installed on all Jenkins slaves (Fedora, CentOS)
 slave_packages_common:
diff --git a/roles/jenkins/master/templates/slave-config.xml.j2 b/roles/jenkins/master/templates/slave-config.xml.j2
index e27200b7d9..b4fcc52971 100644
--- a/roles/jenkins/master/templates/slave-config.xml.j2
+++ b/roles/jenkins/master/templates/slave-config.xml.j2
@@ -13,7 +13,7 @@
     <maxNumRetries>0</maxNumRetries>
     <retryWaitTime>0</retryWaitTime>
   </launcher>
-  <label></label>
+  <label>{{ item.labels }}</label>
   <nodeProperties/>
   <userId>mizdebsk</userId>
 </slave>