From f597ae816b1e5ef25a2fbb9da5f1d09095798745 Mon Sep 17 00:00:00 2001
From: Ed Warnicke <eaw@cisco.com>
Date: Tue, 12 Apr 2016 17:15:12 -0500
Subject: Turn on multi-os merge jobs

Change-Id: Iff99c3e8b8dadc6334b33fe5aff688102273fcb5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---
 jjb/vpp/vpp.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'jjb/vpp/vpp.yaml')

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9b96f483a..1d046d6af 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -2,7 +2,7 @@
     name: vpp
     jobs:
         - 'vpp-verify-{branch}-{os}'
-        - 'vpp-merge'
+        - 'vpp-merge-{branch}-{os}'
         - 'vpp-csit-verify-virl'
         - 'vpp-verify-performance-{type}'
 
@@ -58,10 +58,10 @@
 
 
 - job-template:
-    name: vpp-merge
+    name: 'vpp-merge-{branch}-{os}'
 
     project-type: freestyle
-    node: merge
+    node: 'merge-{os}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -74,6 +74,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
         - maven-project-parameter:
             maven: '{mvn33}'
 
-- 
cgit 1.2.3-korg