X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit.yaml;h=ad5d618ba375168d9de59f5e87d395259127329c;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=7de5885f92835f9246e4077a7e312269932748fe;hpb=263247c552883c1867ebeb927a4babf2932bfabe;p=ci-management.git

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 7de5885f9..ad5d618ba 100644
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -34,11 +34,12 @@
         - 'csit-docs-merge-{stream_timed}'
         - 'csit-docs-verify-{stream}'
         - 'csit-report-merge-{stream}'
-        - 'csit-report-merge-1801_2'
         - 'csit-trending-daily-master'
         - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}'
         - 'csit-dpdk-perf-mrr-weekly-master'
-        - 'csit-ligato-perf-{stream}-{type}'
+        - 'csit-dpdk-perf-mrr-weekly-master-2n-skx'
+        - 'csit-dpdk-perf-mrr-weekly-master-3n-skx'
+        - 'csit-ligato-perf-verify-{stream}-{topo}-{arch}'
         - 'csit-vpp-perf-mrr-daily-master'
         - 'csit-vpp-perf-mrr-daily-master-2n-skx'
         - 'csit-vpp-perf-mrr-daily-master-3n-skx'
@@ -61,9 +62,6 @@
         - master:
             branch: 'master'
             branch-id: 'oper'
-        - '1807':
-            branch: 'rls1807'
-            branch-id: 'oper-rls1807'
     stream:
         - master:
             branch: 'master'
@@ -86,7 +84,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -169,7 +167,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -227,13 +225,52 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-ligato-perf-{stream}-{type}'
+    name: 'csit-ligato-perf-verify-{stream}-{topo}-{arch}'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>perf verify - per csit gerrit patch
+              </ul>
+          <li>job
+              <ul>
+                  <li>name: <b>csit-ligato-perf-verify-{stream}-{topo}-{arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit--ligato-{topo}-{arch}-perftest tag_list</b>
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected using trigger keyword followed by tags
+                  <li>all test-cases are labelled with CSIT RF topic tags
+                      defined in <i>csit/docs/tag_documentation.rst</i>
+              </ul>
+          <li>proposed keywords
+              <ul>
+                  <li>focus on testing specified Kubernetes orchestrated topologies
+                  <li>format: csit-ligato-{topo}-{arch}-perftest tag_list
+              </ul>
+          <li>default tags for vpp startup config and perf test type
+              <ul>
+                  <li>IP4BASE, IP6BASE, L2BDBASE
+                  <li>64B/78B: 64B/78B packet size
+                  <li>1C: one core
+                  <li>X710: x710 Fortville NIC
+                  <li>MRR: MRR throughput
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: no
+              </ul>
+      </ul>
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-4c-4g'
+    node: 'ubuntu1804-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -244,8 +281,9 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - type-parameter:
-            type: '{type}'
+        - gerrit-refspec-parameter
+        - gerrit-event-type-parameter
+        - gerrit-event-comment-text-parameter
 
     scm:
         - gerrit-trigger-scm:
@@ -258,10 +296,22 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-manually-triggered:
-            name: '{project}'
-            branch: '{branch}'
-            comment-trigger-value: 'verify-perf-ligato-{type}'
+        - gerrit:
+            server-name: 'Primary'
+            trigger-on:
+                - comment-added-contains-event:
+                    comment-contains-value: 'csit-ligato-{topo}-{arch}-perftest'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: '{project}'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: false
+                failed: false
+                unstable: false
+                notbuilt: false
 
     builders:
         - shell:
@@ -289,7 +339,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -341,7 +391,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -391,7 +441,7 @@
     node: centos7-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -445,7 +495,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -506,7 +556,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -583,7 +633,7 @@
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -651,13 +701,13 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-report-merge-1801_2'
+    name: 'csit-trending-daily-master'
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -667,14 +717,14 @@
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'rls1801_2'
+            branch: '{branch}'
         - maven-exec:
             maven-version: 'mvn33-new'
 
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: '$GERRIT_REFSPEC'
+            refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
@@ -682,22 +732,9 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit:
-            server-name: 'Primary'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'run-report'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/rls1801_2'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+        - reverse:
+            jobs: 'csit-vpp-perf-mrr-daily-master'
+            result: 'failure'
 
     builders:
         - maven-target:
@@ -711,27 +748,53 @@
             settings-file: 'csit-settings'
             global-settings-file: 'global-settings'
         - shell:
-            !include-raw-escape: include-raw-csit-report.sh
+            !include-raw-escape: include-raw-csit-cpta.sh
 
     publishers:
-        - archive:
-            artifacts: 'resources/tools/presentation/csit.report.tar.gz'
-            allow-empty: 'true'
-            fingerprint: false
-            only-if-success: true
-            default-excludes: false
+        - email-ext:
+            recipients: 'tifrank@cisco.com, csit-report@lists.fd.io'
+            reply-to: ''
+            content-type: 'text'
+            subject: 'FD.io CSIT Trending Alert: Build # $BUILD_NUMBER'
+            attachments: '**/_build/_static/vpp/failed-tests*.tar.gz'
+            body: |
+                FD.io CSIT Trending Alert - failed tests
+
+                $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS
+
+                See attachment for the list of the failed tests.
+
+            always: true
+            failure: false
 
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-trending-daily-master'
+    name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw'
 
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>check vpp perf ndrpdr weekly on 3n-hsw
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>pre-selected CSIT VPP NDRPDR perf suites
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: csit project (catch malfunctions/degradations)
+              </ul>
+      </ul>
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -742,50 +805,42 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
 
     wrappers:
         - fdio-infra-wrappers-non-activity-timeout:
             build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: 'csit-vpp-perf-mrr-daily-master'
-            result: 'failure'
+        - timed: '0 0 * * 6'
 
     builders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'csit-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'csit-settings'
-            global-settings-file: 'global-settings'
+        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
         - shell:
-            !include-raw-escape: include-raw-csit-cpta.sh
+            !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
 
     publishers:
+        - archive-artifacts:
+            artifacts: 'csit/archive/*.*'
+            latest-only: false
+
+        - robot:
+            output-path: 'csit/archive'
+            other-files:
+              - '*.*'
+
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw'
+    name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx'
 
     description: |
       <ul>
           <li>objective
               <ul>
-                  <li>check vpp perf ndrpdr weekly on 3n-hsw
+                  <li>check vpp perf ndrpdr weekly
               </ul>
           <li>perf test-cases selection
               <ul>
@@ -802,7 +857,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -842,7 +897,7 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx'
+    name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx'
 
     description: |
       <ul>
@@ -865,7 +920,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -905,17 +960,17 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx'
+    name: 'csit-vpp-perf-mrr-daily-master'
 
     description: |
       <ul>
           <li>objective
               <ul>
-                  <li>check vpp perf ndrpdr weekly
+                  <li>check vpp perf mrr daily
               </ul>
           <li>perf test-cases selection
               <ul>
-                  <li>pre-selected CSIT VPP NDRPDR perf suites
+                  <li>all CSIT VPP MRR perf suites
               </ul>
           <li>results
               <ul>
@@ -924,11 +979,12 @@
                   <li>analyse: csit project (catch malfunctions/degradations)
               </ul>
       </ul>
+
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: false
+    concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -945,7 +1001,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: '0 0 * * 6'
+        - timed: '0 2,16 * * *'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -964,11 +1020,15 @@
             other-files:
               - '*.*'
 
+        - trigger:
+            project: 'csit-trending-daily-master'
+            threshold: 'FAILURE'
+
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-daily-master'
+    name: 'csit-vpp-perf-mrr-daily-master-2n-skx'
 
     description: |
       <ul>
@@ -992,7 +1052,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1009,8 +1069,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        # - timed: '0 2,16 * * *'
-        - timed: '0 16 * * 1,3,5'
+        - timed: '0 2,16 * * *'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1037,7 +1096,7 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-daily-master-2n-skx'
+    name: 'csit-vpp-perf-mrr-daily-master-3n-skx'
 
     description: |
       <ul>
@@ -1061,7 +1120,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1078,8 +1137,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        # - timed: '0 2,16 * * *'
-        - timed: '0 16 * * 1,3,5'
+        - timed: '0 2,16 * * *'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1106,17 +1164,17 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-daily-master-3n-skx'
+    name: 'csit-dpdk-perf-mrr-weekly-master'
 
     description: |
       <ul>
           <li>objective
               <ul>
-                  <li>check vpp perf mrr daily
+                  <li>check dpdk perf mrr weekly
               </ul>
           <li>perf test-cases selection
               <ul>
-                  <li>all CSIT VPP MRR perf suites
+                  <li>all CSIT DPDK MRR perf suites
               </ul>
           <li>results
               <ul>
@@ -1128,9 +1186,9 @@
 
     project-type: freestyle
     node: 'ubuntu1604-basebuild-4c-4g'
-    concurrent: true
+    concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1147,8 +1205,7 @@
             build-timeout: '{build-timeout}'
 
     triggers:
-        # - timed: '0 2,16 * * *'
-        - timed: '0 16 * * 1,3,5'
+        - timed: '0 0 * * 6'
 
     builders:
         - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
@@ -1175,7 +1232,75 @@
             maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-dpdk-perf-mrr-weekly-master'
+    name: 'csit-dpdk-perf-mrr-weekly-master-2n-skx'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>check dpdk perf mrr weekly
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>all CSIT DPDK MRR perf suites
+              </ul>
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: no
+                  <li>analyse: csit project (catch malfunctions/degradations)
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: 'ubuntu1604-basebuild-4c-4g'
+    concurrent: 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}'
+
+    wrappers:
+        - fdio-infra-wrappers-non-activity-timeout:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - timed: '0 0 * * 6'
+
+    builders:
+        - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
+        - inject:
+            properties-file: variables.prop
+        - shell:
+            !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
+
+    publishers:
+        - archive-artifacts:
+            artifacts: 'csit/archive/*.*'
+            latest-only: false
+
+        - robot:
+            output-path: 'csit/archive'
+            other-files:
+              - '*.*'
+
+        - trigger:
+            project: 'csit-trending-daily-master'
+            threshold: 'FAILURE'
+
+        - fdio-infra-shiplogs:
+            maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-dpdk-perf-mrr-weekly-master-3n-skx'
 
     description: |
       <ul>
@@ -1199,7 +1324,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: false
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1242,6 +1367,7 @@
         - fdio-infra-shiplogs:
             maven-version: 'mvn33-new'
 
+
 - job-template:
     name: 'csit-vpp-perf-verify-{stream}-{topo}-{arch}'
 
@@ -1288,7 +1414,7 @@
     node: 'ubuntu1604-basebuild-8c-32g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1299,6 +1425,9 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter
+        - gerrit-event-type-parameter
+        - gerrit-event-comment-text-parameter
 
     scm:
         - gerrit-trigger-scm:
@@ -1352,7 +1481,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1406,7 +1535,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1460,7 +1589,7 @@
     node: '{os}-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
@@ -1512,7 +1641,7 @@
     node: 'ubuntu1604-basebuild-4c-4g'
     concurrent: true
 
-    logrotate:
+    build-discarder:
         daysToKeep: '{build-days-to-keep}'
         numToKeep: '{build-num-to-keep}'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'