Fix virl scripts broken by {os}

Change-Id: I9f16666cf18753ce47d74fa21c125b1375407ecf
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 1d046d6..fb3bfd0 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -3,8 +3,6 @@
     jobs:
         - 'vpp-verify-{branch}-{os}'
         - 'vpp-merge-{branch}-{os}'
-        - 'vpp-csit-verify-virl'
-        - 'vpp-verify-performance-{type}'
 
     project: 'vpp'
     os:
@@ -15,6 +13,18 @@
         - short
         - long
 
+- project:
+    name: vpp-misc
+    jobs:
+        - 'vpp-csit-verify-virl'
+        - 'vpp-verify-performance-{type}'
+    project: 'vpp'
+    branch: 'master'
+    os: ubuntu1404
+    type:
+        - short
+        - long
+
 - job-template:
     name: 'vpp-verify-{branch}-{os}'
 
@@ -113,7 +123,7 @@
     name: 'vpp-csit-verify-virl'
 
     project-type: freestyle
-    node: verify
+    node: 'verify-{os}'
     concurrent: true
 
     logrotate:
@@ -127,6 +137,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
 
     scm:
         - gerrit-trigger-scm:
@@ -162,7 +174,7 @@
     name: 'vpp-verify-performance-{type}'
 
     project-type: freestyle
-    node: verify
+    node: 'verify-{os}'
     concurrent: false
 
     logrotate:
@@ -176,6 +188,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - os-parameter:
+            os: '{os}'
         - type-parameter:
             type: '{type}'