Merge "Add INFO.yaml verify job"

[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 5ff9912..64de3ea 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -11,20 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+---
 - project:
     name: csit-vpp-device
     description: 'CSIT jenkins jobs.'
     os:
       - 'ubuntu1804'
-    topo:
-      - '1n'
-    arch:
-      - 'skx'
+    node-arch:
+      - '1n-skx'
     jobs:
-      - 'csit-vpp-device-{stream}-{os}-{topo}-{arch}'
-      - 'csit-vpp-device-{stream_timed}-{os}-{topo}-{arch}-semiweekly'
-      - 'csit-vpp-device-{stream_timed}-{os}-{topo}-{arch}-weekly'
+      - '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'
     project: 'csit'
     branch: 'master'
     branch-id: 'oper'
@@ -32,6 +30,9 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
     stream:
       - master:
           branch: 'master'
@@ -39,9 +40,15 @@
       - '1810':
           branch: 'rls1810'
           branch-id: 'oper-rls1810'
+      - '1901':
+          branch: 'rls1901'
+          branch-id: 'oper-rls1901'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
 
 - job-template:
-    name: 'csit-vpp-device-{stream}-{os}-{topo}-{arch}'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
     description: |
       <ul>
           <li>objective
@@ -50,7 +57,7 @@
               </ul>
           <li>job
               <ul>
-                  <li>name: <b>csit-vpp-device-{stream}-{os}-{topo}-{arch}</b>
+                  <li>name: <b>csit-vpp-device-{stream}-{os}-{node-arch}</b>
                   <li>trigger: keyword in comment to csit patch:
                       <b>csit-devicetest tag_list</b>
               </ul>
@@ -75,6 +82,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -92,6 +101,10 @@
       - gerrit-refspec-parameter
       - gerrit-event-type-parameter
       - gerrit-event-comment-text-parameter
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -130,9 +143,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
       - robot:
           output-path: archive
           other-files:
@@ -141,7 +151,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{topo}-{arch}-semiweekly'
+    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
     description: |
       <ul>
           <li>objective
@@ -171,6 +181,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -185,6 +197,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     wrappers:
       - fdio-infra-wrappers-non-activity-timeout:
@@ -199,13 +215,13 @@
           branch: '{branch}'
 
     builders:
+      - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+      - inject:
+          properties-file: variables.prop
       - shell:
           !include-raw-escape: jjb/csit/include-raw-csit-device-semiweekly.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'csit/archive/*.*'
-          latest-only: false
       - robot:
           output-path: 'csit/archive'
           other-files:
@@ -214,7 +230,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-device-{stream_timed}-{os}-{topo}-{arch}-weekly'
+    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
     description: |
       <ul>
           <li>objective
@@ -243,6 +259,8 @@
     project-type: freestyle
     node: 'vpp-csit-device'
     concurrent: false
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -257,6 +275,10 @@
           branch: '{branch}'
       - os-parameter:
           os: '{os}'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git-scm:
@@ -280,9 +302,6 @@
           !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
 
     publishers:
-      - archive-artifacts:
-          artifacts: 'archive/*.*'
-          latest-only: false
       - robot:
           output-path: archive
           other-files: