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 70dee6d..a34c170 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -25,46 +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'
-      - '1901':
-          branch: 'rls1901'
-          branch-id: 'oper-rls1901'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
-      - '1908':
-          branch: 'rls1908_1'
-          branch-id: 'oper-rls1908_1'
-    exclude:
-      - stream: '1901'
-        os: 'ubuntu1804'
-        node-arch: '1n-tx2'
-      - 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}'
@@ -80,6 +74,10 @@
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-devicetest tag_list</b>
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>test-cases selected using trigger keyword followed by tags
@@ -148,7 +146,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -159,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
@@ -168,6 +167,10 @@
                       in nexus against verified CSIT codebase of corresponding
                       branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -227,7 +230,8 @@
       - inject:
           properties-file: variables.prop
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-semiweekly.sh
 
     publishers:
       - robot:
@@ -238,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
@@ -246,6 +250,10 @@
                   <li>Validate CSIT code of corresponding branch against
                       verified vpp build from corresponding branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -307,7 +315,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -318,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
@@ -326,6 +335,10 @@
                   <li>Validate CSIT code of corresponding branch against
                       verified vpp build from corresponding branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>vpp-csit-arm-ubuntu18
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -382,7 +395,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-verify.sh
 
     publishers:
       - robot:
@@ -393,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
@@ -402,6 +416,10 @@
                       in nexus against verified CSIT codebase of corresponding
                       branch.
               </ul>
+          <li>executor
+              <ul>
+                  <li>vpp-csit-arm-ubuntu18
+              </ul>
           <li>test-cases selection
               <ul>
                   <li>pre-selected test-cases
@@ -456,7 +474,8 @@
       - inject:
           properties-file: variables.prop
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
+          !include-raw-escape:
+          - ../scripts/csit/device-semiweekly.sh
 
     publishers:
       - robot: