X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-device.yaml;h=3e3571401840e1dd577204a698933f928b8104a4;hb=af3339f2ceeab07c2287c5fe7703786d1cb30c39;hp=28e4bb54ae20b3c386a0c100d705d972f9b5be1b;hpb=c9303c94c8882e95e3d7d7f5cbd9e7fa2baeb6ac;p=ci-management.git

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index 28e4bb54a..3e3571401 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,3 @@
----
 # Copyright (c) 2019 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.
@@ -12,46 +11,57 @@
 # 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'
+      - '1n-tx2':
+          executor: 'vpp-csit-arm-ubuntu18'
+          skip-vote: 'true'
+          trigger: 'gerrit-trigger-csit-vpp-devicetest-manual'
     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'
+      - 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
+      - 'csit-vpp-device-master-ubuntu1804-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'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1810':
-          branch: 'rls1810'
-          branch-id: 'oper-rls1810'
-      - '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: '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'
 
 - job-template:
-    name: 'csit-vpp-device-{stream}-{os}-{topo}-{arch}'
+    name: 'csit-vpp-device-{stream}-{os}-{node-arch}'
     description: |
       <ul>
           <li>objective
@@ -60,7 +70,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>
@@ -83,7 +93,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'vpp-csit-device'
+    node: '{executor}'
     concurrent: true
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -108,6 +118,11 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      # This is an automatic verify job, part of API coverage.
+      # CRC checking is needed to ensure vpp crc job breaks only when intended.
+      # Unlikely to be removed, as this job is primary source of API coverage.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
 
     scm:
       - gerrit-trigger-scm:
@@ -120,26 +135,10 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'true'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-            - comment-added-contains-event:
-                comment-contains-value: 'csit-devicetest'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+      - '{trigger}':
+          project: '{project}'
+          branch: '{branch}'
+          skip-vote: '{skip-vote}'
 
     builders:
       - shell:
@@ -154,7 +153,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
@@ -182,7 +181,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'vpp-csit-device'
+    node: '{executor}'
     concurrent: false
     archive-artifacts: 'csit/archive/*.*'
     latest-only: false
@@ -233,7 +232,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
@@ -260,7 +259,7 @@
       </ul>
 
     project-type: freestyle
-    node: 'vpp-csit-device'
+    node: '{executor}'
     concurrent: false
     archive-artifacts: 'archive/*.*'
     latest-only: false
@@ -311,3 +310,152 @@
             - '*.*'
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-csit-verify-hourly'
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>Validate CSIT code of corresponding branch against
+                      verified vpp build from corresponding branch.
+              </ul>
+          <li>test-cases selection
+              <ul>
+                  <li>pre-selected test-cases
+                  <li>all test-cases are labelled with CSIT RF topic tags
+                      defined in <i>csit/docs/tag_documentation.rst</i>
+              </ul>
+          <li>default tags for vpp-device test type
+              <ul>
+                  <li>devicetest
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: no
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: 'vpp-csit-arm-ubuntu18'
+    concurrent: false
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: 'ubuntu1804'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    scm:
+      - git-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          branch: '{branch}'
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '0 * * * *'
+
+    builders:
+      - shell:
+          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+
+    publishers:
+      - robot:
+          output-path: archive
+          other-files:
+            - '*.*'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-vpp-device-master-ubuntu1804-1n-tx2-vpp-verify-hourly'
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>Validate latest vpp build from corresponding branch stored
+                      in nexus against verified CSIT codebase of corresponding
+                      branch.
+              </ul>
+          <li>test-cases selection
+              <ul>
+                  <li>pre-selected test-cases
+                  <li>all test-cases are labelled with CSIT RF topic tags
+                      defined in <i>csit/docs/tag_documentation.rst</i>
+              </ul>
+          <li>default tags for vpp-device test type
+              <ul>
+                  <li>devicetest
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: no
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: 'vpp-csit-arm-ubuntu18'
+    concurrent: false
+    archive-artifacts: 'csit/archive/*.*'
+    latest-only: false
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: 'ubuntu1804'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    wrappers:
+      - fdio-infra-wrappers-non-activity-timeout:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '30 * * * *'
+
+    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:
+      - robot:
+          output-path: 'csit/archive'
+          other-files:
+            - '*.*'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'