Turn on multi-os merge jobs

Change-Id: Iff99c3e8b8dadc6334b33fe5aff688102273fcb5
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh
index aea6067..5f42cbd 100644 (file)
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -70,15 +70,15 @@ function push_deb ()
 
     push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb
 }
-
-for i in $JARS
-do
-    push_jar "$i"
-done
-
-for i in $DEBS
-do
-    push_deb "$i"
-done
-
+if [ ${OS} == "ubuntu1404" ]; then
+    for i in $JARS
+    do
+        push_jar "$i"
+    done
+
+    for i in $DEBS
+    do
+        push_deb "$i"
+    done
+fi
 # vim: ts=4 sw=4 sts=4 et ft=sh :

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9b96f48..1d046d6 100644 (file)
--- 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}'