Changes to accomodate vpp throttle branch.

[ci-management.git] / jjb / vpp / vpp.yaml

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index e9815d9..3b25b0c 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1,16 +1,22 @@
 - project:
     name: vpp
     jobs:
-        - 'vpp-verify-{branch}-{os}'
-        - 'vpp-merge-{branch}-{os}'
-        - 'vpp-verify-image-{branch}-{os}'
+        - 'vpp-verify-{stream}-{os}'
+        - 'vpp-merge-{stream}-{os}'
+        - 'vpp-verify-image-{stream}-{os}'
 
     project: 'vpp'
     os:
         - ubuntu1404
         - centos7
         - ubuntu1604
-    branch: 'master'
+    stream:
+        - master:
+            branch: master
+        - test:
+            branch: stable/test
+        - 1606:
+            branch: stable/1606
     type:
         - short
         - long
@@ -29,7 +35,7 @@
         - long
 
 - job-template:
-    name: 'vpp-verify-{branch}-{os}'
+    name: 'vpp-verify-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-{os}'
@@ -70,7 +76,7 @@
             !include-raw-escape include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-verify-image-{branch}-{os}'
+    name: 'vpp-verify-image-{stream}-{os}'
 
     project-type: freestyle
     node: 'verify-image-{os}'
@@ -124,7 +130,7 @@
             !include-raw-escape include-raw-vpp-build.sh
 
 - job-template:
-    name: 'vpp-merge-{branch}-{os}'
+    name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: 'merge-{os}'