X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=25680bd4a28b01e6c5044c1ad706022b074db718;hb=cd2f3e08d1d8dd65a705c734c771fde32b99e9e6;hp=f4622dfb5a4692114575f4267bd8f30ef5d2ac68;hpb=9860e60edd303ff490bfa1d600e7fd2a002c8a87;p=ci-management.git

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index f4622dfb5..25680bd4a 100644
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -23,6 +23,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -33,13 +34,17 @@
             - ''
             - -2n-clx
             - -2n-skx
+            - -2n-zn2
             - -3n-skx
+            - -3n-tsh:
+                executor: 'ubuntu1804arm-us'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-verify-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -55,26 +60,31 @@
             - '1908_2':
                 branch: 'rls1908_2'
                 branch-id: 'oper-rls1908_2'
-            - '2001':
-                branch: 'rls2001'
-                branch-id: 'oper-rls2001'
             - '2005':
                 branch: 'rls2005'
                 branch-id: 'oper-rls2005'
+            - '2009':
+                branch: 'rls2009'
+                branch-id: 'oper-rls2009'
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
       - 'csit-vpp-perf-mrr-daily-master{node-arch}':
           node-arch:
             - '':
-                periodicity: '0 14 * * *'
+                periodicity: '0 2,14 * * *'
             - -2n-clx:
-                periodicity: '0 14 * * *'
+                periodicity: '0 2,14 * * *'
             - -2n-skx:
-                periodicity: '0 14 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -2n-dnv:
-                periodicity: '0 14 * * *'
+                periodicity: '0 2,14 * * *'
+            - -2n-zn2:
+                periodicity: '0 2,14 * * *'
             - -3n-skx:
-                periodicity: '0 14 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -3n-dnv:
-                periodicity: '0 14 * * *'
+                periodicity: '0 2,14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
                 periodicity: '0 14 * * *'
@@ -90,6 +100,9 @@
             - '1908_2':
                 branch: 'rls1908_2'
                 branch-id: 'oper-rls1908_2'
+            - '2009_lts':
+                branch: 'rls2009_lts'
+                branch-id: 'oper-rls2009_lts'
           periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
@@ -98,20 +111,50 @@
             - 3n-skx
             - 3n-hsw
           periodicity: '0 0 * * 6'
-      - 'csit-vpp-perf-report-iterative-{stream}-{node-arch}':
+      - 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+                executor: 'ubuntu1804arm-us'
+      - 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 2n-zn2
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+                executor: 'ubuntu1804arm-us'
+      - 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 2n-zn2
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+                executor: 'ubuntu1804arm-us'
+      - 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
             - 3n-tsh:
                 executor: 'ubuntu1804arm-us'
-          stream:
-            - '2005':
-                branch: 'rls2005'
-                branch-id: 'oper-rls2005'
 
     project: 'csit'
     executor: 'ubuntu1804-us'
@@ -126,12 +169,20 @@
       - '1908_2':
           branch: 'rls1908_2'
           branch-id: 'oper-rls1908_2'
-      - '2001':
-          branch: 'rls2001'
-          branch-id: 'oper-rls2001'
       - '2005':
           branch: 'rls2005'
           branch-id: 'oper-rls2005'
+      - '2009':
+          branch: 'rls2009'
+          branch-id: 'oper-rls2009'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+          branch-id: 'oper-rls2009_lts'
+    stream_report:
+      - '2009':
+          branch: 'rls2009'
+          branch-id: 'oper-rls2009'
+
     build-artifact-num-to-keep: 10
 
 
@@ -233,13 +284,16 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
-          output-path: archive
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -308,13 +362,16 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -383,13 +440,16 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -453,13 +513,16 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -551,13 +614,16 @@
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
-          output-path: archive
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -626,13 +692,16 @@
       - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop'
       - inject:
           properties-file: variables.prop
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
-          output-path: 'csit/archive'
+          output-path: 'archives'
           other-files:
             - '*.*'
 
@@ -640,7 +709,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-report-iterative-{stream}-{node-arch}'
+    name: 'csit-vpp-perf-report-iterative-{stream_report}-{node-arch}'
 
     description: |
       <ul>
@@ -651,9 +720,211 @@
           <li>job
               <ul>
                   <li>name:
-                      <b>csit-vpp-perf-report-iterative-{stream}-{node-arch}</b>
+                      <b>csit-vpp-perf-report-iterative-{stream_report}-
+                      {node-arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit-vpp-report-iter-{node-arch}-perftest
+                      test_set_id</b>
+                  <li>trigger example:
+                      csit-vpp-report-iter-{node-arch}-perftest vpp-00
+              </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected by tags defined in
+                      <i>csit/docs/job_specs/report_iterative/{node-arch}/
+                      test_set_id.md</i>
+              </ul>
+
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: vpp performance
+                  <li>analyse: vpp performance
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: '{executor}'
+    concurrent: true
+    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}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    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-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-vpp-report-iter-{node-arch}-perftest'
+          skip-vote: false
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
+
+    publishers:
+      - robot:
+          output-path: 'archives'
+          other-files:
+            - '*.*'
+
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-dpdk-perf-report-iterative-{stream_report}-{node-arch}'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>get dpdk performance iterative data for csit report
+              </ul>
+          <li>job
+              <ul>
+                  <li>name:
+                      <b>csit-dpdk-perf-report-iterative-{stream_report}-
+                      {node-arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit-dpdk-report-iter-{node-arch}-perftest
+                      test_set_id</b>
+                  <li>trigger example:
+                      csit-dpdk-report-iter-{node-arch}-perftest dpdk-00
+              </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected by tags defined in
+                      <i>csit/docs/job_specs/report_iterative/{node-arch}/
+                      test_set_id.md</i>
+              </ul>
+
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: dpdk performance
+                  <li>analyse: dpdk performance
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: '{executor}'
+    concurrent: true
+    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}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    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-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-dpdk-report-iter-{node-arch}-perftest'
+          skip-vote: false
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
+
+    publishers:
+      - robot:
+          output-path: 'archives'
+          other-files:
+            - '*.*'
+
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-vpp-perf-report-coverage-{stream_report}-{node-arch}'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>get vpp performance coverage data for csit report
+              </ul>
+          <li>job
+              <ul>
+                  <li>name:
+                      <b>csit-vpp-perf-report-coverage-{stream_report}-
+                      {node-arch}</b>
                   <li>trigger: keyword in comment to csit patch:
-                      <b>csit-report-iter-{node-arch}-perftest</b>
+                      <b>csit-vpp-report-cov-{node-arch}-perftest
+                      test_set_id</b>
+                  <li>trigger example:
+                      csit-vpp-report-cov-{node-arch}-perftest ip4-00
               </ul>
           <li>executor
               <ul>
@@ -662,7 +933,8 @@
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
-                      <i>csit/docs/job_specs/report-iter-{node-arch}.md</i>
+                      <i>csit/docs/job_specs/report_coverage/{node-arch}/
+                      test_set_id.md</i>
               </ul>
 
           <li>results
@@ -713,17 +985,119 @@
       - gerrit-trigger-csit-perftest:
           project: '{project}'
           branch: '{branch}'
-          trigger-word: 'csit-report-iter-{node-arch}-perftest'
+          trigger-word: 'csit-vpp-report-cov-{node-arch}-perftest'
           skip-vote: false
 
     builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
+
+    publishers:
+      - robot:
+          output-path: 'archives'
+          other-files:
+            - '*.*'
+
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
+
+- job-template:
+    name: 'csit-dpdk-perf-report-coverage-{stream_report}-{node-arch}'
+
+    description: |
+      <ul>
+          <li>objective
+              <ul>
+                  <li>get dpdk performance coverage data for csit report
+              </ul>
+          <li>job
+              <ul>
+                  <li>name:
+                      <b>csit-dpdk-perf-report-coverage-{stream_report}-
+                      {node-arch}</b>
+                  <li>trigger: keyword in comment to csit patch:
+                      <b>csit-dpdk-report-cov-{node-arch}-perftest
+                      test_set_id</b>
+                  <li>trigger example:
+                      csit-dpdk-report-cov-{node-arch}-perftest dpdk-00
+              </ul>
+          <li>executor
+              <ul>
+                  <li>{executor}
+              </ul>
+          <li>perf test-cases selection
+              <ul>
+                  <li>test-cases selected by tags defined in
+                      <i>csit/docs/job_specs/report_coverage/{node-arch}/
+                      test_set_id.md</i>
+              </ul>
+
+          <li>results
+              <ul>
+                  <li>jjb verify: PASS/FAIL
+                  <li>present: dpdk performance
+                  <li>analyse: dpdk performance
+              </ul>
+      </ul>
+
+    project-type: freestyle
+    node: '{executor}'
+    concurrent: true
+    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}'
+      - csit-perf-trial-duration-parameter:
+          csit-perf-trial-duration: "{csit-perf-trial-duration}"
+      - csit-perf-trial-multiplicity-parameter:
+          csit-perf-trial-multiplicity: "{csit-perf-trial-multiplicity}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
+
+    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-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-dpdk-report-cov-{node-arch}-perftest'
+          skip-vote: false
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_executor_env.sh
       - shell:
           !include-raw-escape:
           - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
-          output-path: archive
+          output-path: 'archives'
           other-files:
             - '*.*'