Merge "Add CSIT rls1908_2 branch"

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

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 3c713d0..a34c170 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -25,40 +25,40 @@
           trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
     jobs:
       - 'csit-vpp-device-{stream}-{os}-{node-arch}'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
-      - 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
-      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly':
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '1908_2':
+                branch: 'rls1908_2'
+                branch-id: 'oper-rls1908_2'
+      - 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly':
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '1908_2':
+                branch: 'rls1908_2'
+                branch-id: 'oper-rls1908_2'
+      - 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
+      - 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
 
     project: 'csit'
     executor: 'vpp-csit-device'
     branch: 'master'
     branch-id: 'oper'
     trigger: 'gerrit-trigger-csit-vpp-devicetest-full'
-    stream_timed:
-      - master:
-          branch: 'master'
-          branch-id: 'oper'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
-      - '1908':
-          branch: 'rls1908_1'
-          branch-id: 'oper-rls1908_1'
-    exclude:
-      - stream: '1904'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: '1908'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - stream_timed: 'master'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
+      - '1908_2':
+          branch: 'rls1908_2'
+          branch-id: 'oper-rls1908_2'
+      - '2001':
+          branch: 'rls2001'
+          branch-id: 'oper-rls2001'
 
 - job-template:
     name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
@@ -158,7 +158,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-semiweekly'
     description: |
       <ul>
           <li>objective
@@ -242,7 +242,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}-weekly'
     description: |
       <ul>
           <li>objective
@@ -327,7 +327,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-csit-verify-hourly'
     description: |
       <ul>
           <li>objective
@@ -407,7 +407,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+    name: 'csit-vpp-device-master-{os}-1n-tx2-vpp-verify-hourly'
     description: |
       <ul>
           <li>objective