X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-vpp-device.yaml;h=64de3ead99447979f9e2af08e4b1efe6fb43bd0f;hb=64a07c6bdc040b965965e983c2be6dadb46fef11;hp=b3d7f798fc4a4939a2de393f979eed79b2598687;hpb=91cfd7c256c6439424710a3f7b060e44a86aef81;p=ci-management.git

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index b3d7f798f..64de3ead9 100644
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# 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.
 # You may obtain a copy of the License at:
@@ -11,21 +11,28 @@
 # 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}-{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'
+    stream_timed:
+      - master:
+          branch: 'master'
+          branch-id: 'oper'
+      - '1904':
+          branch: 'rls1904'
+          branch-id: 'oper-rls1904'
     stream:
       - master:
           branch: 'master'
@@ -33,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
@@ -44,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>
@@ -67,8 +80,10 @@
       </ul>
 
     project-type: freestyle
-    node: 'foo'
+    node: 'vpp-csit-device'
     concurrent: true
+    archive-artifacts: 'archive/*.*'
+    latest-only: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -86,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:
@@ -101,6 +120,15 @@
       - 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:
@@ -109,20 +137,171 @@
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
 
     builders:
       - shell:
           !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:
+            - '*.*'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-semiweekly'
+    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-device'
+    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: '{os}'
+      - 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: '0 4 * * 2,6'
+
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'csit-verify-vpp'
+          name: '{project}'
+          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:
+      - robot:
+          output-path: 'csit/archive'
+          other-files:
+            - '*.*'
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-vpp-device-{stream_timed}-{os}-{node-arch}-weekly'
+    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-device'
+    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: '{os}'
+      - 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 4 * * 0'
+
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'csit-vpp-ref-verify'
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape: jjb/csit/include-raw-csit-device-verify.sh
+
+    publishers:
       - robot:
           output-path: archive
           other-files: