Merge "CSIT-1193 Update of perf jobs"

diff --combined jjb/csit/csit.yaml
index e5f63b6,7de5885..42f159c
--- 1/jjb/csit/csit.yaml
--- 2/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@@ -36,14 -36,15 +36,15 @@@
          - 'csit-report-merge-{stream}'
          - 'csit-report-merge-1801_2'
          - 'csit-trending-daily-master'
-         - 'csit-dpdk-perf-{stream}-{type}'
          - 'csit-dpdk-perf-verify-{stream}-{topo}-{arch}'
          - 'csit-dpdk-perf-mrr-weekly-master'
          - 'csit-ligato-perf-{stream}-{type}'
-         - 'csit-vpp-perf-{stream}-{type}'
-         - 'csit-vpp-perf-trend-daily-master'
-         - 'csit-vpp-perf-trend-semi-weekly-master'
          - 'csit-vpp-perf-mrr-daily-master'
+         - 'csit-vpp-perf-mrr-daily-master-2n-skx'
+         - 'csit-vpp-perf-mrr-daily-master-3n-skx'
+         - 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw'
+         - 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx'
+         - 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx'
          - 'csit-vpp-perf-verify-{stream}-{topo}-{arch}'
          - 'csit-nsh_sfc-verify-perf-{stream}'
          - 'csit-nsh_sfc-verify-func-{stream}-{os}-virl'
@@@ -60,16 -61,13 +61,10 @@@
          - master:
              branch: 'master'
              branch-id: 'oper'
 -        - '1807':
 -            branch: 'rls1807'
 -            branch-id: 'oper-rls1807'
      stream:
          - master:
              branch: 'master'
              branch-id: 'oper'
-         - '1707':
-             branch: 'rls1707'
-             branch-id: 'oper-rls1707'
-         - '1710':
-             branch: 'rls1710'
-             branch-id: 'oper-rls1710'
          - '1801':
              branch: 'rls1801'
              branch-id: 'oper-rls1801'
@@@ -130,60 -128,6 +125,6 @@@
          - fdio-infra-shiplogs:
              maven-version: 'mvn33-new'
  
- - job-template:
-     name: 'csit-dpdk-perf-{stream}-{type}'
- 
-     project-type: freestyle
-     node: 'ubuntu1604-basebuild-4c-4g'
-     concurrent: true
- 
-     logrotate:
-         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}'
-         - type-parameter:
-             type: '{type}'
- 
-     scm:
-         - gerrit-trigger-scm:
-             credentials-id: 'jenkins-gerrit-credentials'
-             refspec: '$GERRIT_REFSPEC'
-             choosing-strategy: 'gerrit'
- 
-     wrappers:
-         - fdio-infra-wrappers-non-activity-timeout:
-             build-timeout: '{build-timeout}'
- 
-     triggers:
-         - gerrit-trigger-manually-triggered:
-             name: '{project}'
-             branch: '{branch}'
-             comment-trigger-value: 'verify-perf-dpdk-{type}'
- 
-     builders:
-         - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-hw.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-dpdk-perf-verify-{stream}-{topo}-{arch}'
  
@@@ -267,61 -211,7 +208,7 @@@
  
      builders:
          - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-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-perf-{stream}-{type}'
- 
-     project-type: freestyle
-     node: 'ubuntu1604-basebuild-8c-32g'
-     concurrent: true
- 
-     logrotate:
-         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}'
-         - type-parameter:
-             type: '{type}'
- 
-     scm:
-         - gerrit-trigger-scm:
-             credentials-id: 'jenkins-gerrit-credentials'
-             refspec: '$GERRIT_REFSPEC'
-             choosing-strategy: 'gerrit'
- 
-     wrappers:
-         - fdio-infra-wrappers-non-activity-timeout:
-             build-timeout: '{build-timeout}'
- 
-     triggers:
-         - gerrit-trigger-manually-triggered:
-             name: '{project}'
-             branch: '{branch}'
-             comment-trigger-value: 'verify-perf-{type}'
- 
-     builders:
-         - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-hw.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
  
      publishers:
          - archive-artifacts:
@@@ -375,7 -265,7 +262,7 @@@
  
      builders:
          - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-ligato-perf-hw.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
  
      publishers:
          - archive-artifacts:
@@@ -889,32 -779,25 +776,25 @@@
              maven-version: 'mvn33-new'
  
  - job-template:
-     name: 'csit-vpp-perf-trend-daily-master'
+     name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-hsw'
  
      description: |
-       Purpose of this job is to validate latest vpp build from corresponding
-       branch stored in nexus against verified CSIT codebase of corresponding
-       branch.
- 
-       objective
-           daily perf trending of vpp master build
-       job
-          name
-              csit-vpp-perf-trend-daily
-          trigger
-              scheduled daily
-       perf test-cases selection
-           all CSIT perf suites
-       default tags for vpp startup config and perf test type
-           1T1C - one worker thread, one core
-           2T2C - two worker threads, two cores
-           X520 - Intel x520-DA2 NIC
-           NDRDISC - discovery of NDR throughput
-       results
-           jjb verify - no
-           present
-               jenkins trending graphs
- 
+       <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-4c-4g'
      concurrent: false
@@@ -935,12 -818,15 +815,15 @@@
          - 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-vpp-perf-trend-daily.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
  
      publishers:
          - archive-artifacts:
@@@ -956,34 -842,88 +839,88 @@@
              maven-version: 'mvn33-new'
  
  - job-template:
-     name: 'csit-vpp-perf-trend-semi-weekly-master'
+     name: 'csit-vpp-perf-ndrpdr-weekly-master-2n-skx'
  
      description: |
-       Purpose of this job is to validate latest vpp build from corresponding
-       branch stored in nexus against verified CSIT codebase of corresponding
-       branch.
- 
-       consumer
-           csit-dev trending semi-weekly
-       objective
-           semi-weekly perf trending of vpp master build job
-           name
-               csit-vpp-perf-trend-semi-weekly
-           trigger
-               scheduled semi-weekly
-       perf test-cases selection
-           all CSIT perf suites
-       default tags for vpp startup config and perf test type
-           1T1C - one worker thread, one core
-           2T2C - two worker threads, two cores
-           X710 - Intel x710 Fortville NIC
-           XL710 - Intel xl710 Fortville NIC
-           NDRDISC - discovery of NDR throughput
-       results
-           jjb verify - no
-           present
-               jenkins trending graphs
+       <ul>
+           <li>objective
+               <ul>
+                   <li>check vpp perf ndrpdr weekly
+               </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-4c-4g'
+     concurrent: false
+ 
+     logrotate:
+         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:
+               - '*.*'
+ 
+         - fdio-infra-shiplogs:
+             maven-version: 'mvn33-new'
+ 
+ - job-template:
+     name: 'csit-vpp-perf-ndrpdr-weekly-master-3n-skx'
  
+     description: |
+       <ul>
+           <li>objective
+               <ul>
+                   <li>check vpp perf ndrpdr weekly
+               </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-4c-4g'
      concurrent: false
@@@ -1004,12 -944,15 +941,15 @@@
          - 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-vpp-perf-trend-semi-weekly.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
  
      publishers:
          - archive-artifacts:
@@@ -1028,24 -971,22 +968,22 @@@
      name: 'csit-vpp-perf-mrr-daily-master'
  
      description: |
-       objective
-           check vpp perf mrr daily
-       job
-           name
-               csit-vpp-perf-mrr-daily
-           trigger
-               twice a day
-       perf test-cases selection
-           all CSIT MRR perf suites
-       results
-           jjb verify
-               PASS/FAIL
-           present
-               no
-           analyse
-               csit project
-                   catch malfunctions
-                   catch degradations
+       <ul>
+           <li>objective
+               <ul>
+                   <li>check vpp perf mrr daily
+               </ul>
+           <li>perf test-cases selection
+               <ul>
+                   <li>all CSIT VPP 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'
@@@ -1068,14 -1009,153 +1006,152 @@@
              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'
          - inject:
              properties-file: variables.prop
          - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-mrr-daily.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:
+               - '*.*'
+ 
+         - trigger:
+             project: 'csit-trending-daily-master'
+             threshold: 'FAILURE'
+ 
+         - fdio-infra-shiplogs:
+             maven-version: 'mvn33-new'
+ 
+ - job-template:
+     name: 'csit-vpp-perf-mrr-daily-master-2n-skx'
+ 
+     description: |
+       <ul>
+           <li>objective
+               <ul>
+                   <li>check vpp perf mrr daily
+               </ul>
+           <li>perf test-cases selection
+               <ul>
+                   <li>all CSIT VPP 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: true
+ 
+     logrotate:
+         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 2,16 * * *'
+         - timed: '0 16 * * 1,3,5'
+ 
+     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-vpp-perf-mrr-daily-master-3n-skx'
+ 
+     description: |
+       <ul>
+           <li>objective
+               <ul>
+                   <li>check vpp perf mrr daily
+               </ul>
+           <li>perf test-cases selection
+               <ul>
+                   <li>all CSIT VPP 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: true
+ 
+     logrotate:
+         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 2,16 * * *'
+         - timed: '0 16 * * 1,3,5'
+ 
+     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:
@@@ -1098,24 -1178,22 +1174,22 @@@
      name: 'csit-dpdk-perf-mrr-weekly-master'
  
      description: |
-       objective
-           check dpdk perf mrr weekly
-       job
-           name
-               csit-dpdk-perf-mrr-weekly-master
-           trigger
-               weekly
-       perf test-cases selection
-           all CSIT DPDK MRR perf suites
-       results
-           jjb verify
-               PASS/FAIL
-           present
-               no
-           analyse
-               csit project
-                   catch malfunctions
-                   catch degradations
+       <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'
@@@ -1145,7 -1223,7 +1219,7 @@@
          - inject:
              properties-file: variables.prop
          - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-dpdk-perf-mrr-weekly.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-timed.sh
  
      publishers:
          - archive-artifacts:
@@@ -1252,7 -1330,7 +1326,7 @@@
  
      builders:
          - shell:
-             !include-raw-escape: jjb/csit/include-raw-csit-vpp-perf-verify.sh
+             !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
  
      publishers:
          - archive-artifacts: