CSIT: Remove 1908_1 and 1908_2 jobs

[ci-management.git] / jjb / csit / csit-perf.yaml

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 80dd788..057f125 100644 (file)
--- 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
@@ -49,35 +54,34 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '1908_1':
-                branch: 'rls1908_1'
-                branch-id: 'oper-rls1908_1'
-            - '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 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -2n-clx:
-                periodicity: '0 14 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -2n-skx:
-                periodicity: '0 14 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -2n-dnv:
-                periodicity: '0 14 * * 1,4'
+                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 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                periodicity: '0 14 * * 4'
+                periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
@@ -87,9 +91,9 @@
             - master:
                 branch: 'master'
                 branch-id: 'oper'
-            - '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:
@@ -103,6 +107,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -113,6 +118,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -123,6 +129,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -133,6 +140,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -149,19 +157,20 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '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:
-      - '2005':
-          branch: 'rls2005'
-          branch-id: 'oper-rls2005'
+      - '2009':
+          branch: 'rls2009'
+          branch-id: 'oper-rls2009'
+
     build-artifact-num-to-keep: 10
 
 
@@ -263,13 +272,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:
             - '*.*'
 
@@ -338,13 +350,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:
             - '*.*'
 
@@ -413,13 +428,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:
             - '*.*'
 
@@ -483,13 +501,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:
             - '*.*'
 
@@ -581,13 +602,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:
             - '*.*'
 
@@ -656,13 +680,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:
             - '*.*'
 
@@ -684,7 +711,10 @@
                       <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</b>
+                      <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>
@@ -693,8 +723,8 @@
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
-                      <i>csit/docs/job_specs/report_iterative/
-                      vpp-{node-arch}.md</i>
+                      <i>csit/docs/job_specs/report_iterative/{node-arch}/
+                      test_set_id.md</i>
               </ul>
 
           <li>results
@@ -722,6 +752,9 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
@@ -749,13 +782,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:
             - '*.*'
 
@@ -777,7 +813,10 @@
                       <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</b>
+                      <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>
@@ -786,8 +825,8 @@
           <li>perf test-cases selection
               <ul>
                   <li>test-cases selected by tags defined in
-                      <i>csit/docs/job_specs/report_iterative/
-                      dpdk-{node-arch}.md</i>
+                      <i>csit/docs/job_specs/report_iterative/{node-arch}/
+                      test_set_id.md</i>
               </ul>
 
           <li>results
@@ -815,6 +854,9 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
@@ -842,13 +884,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:
             - '*.*'
 
@@ -911,6 +956,9 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
@@ -938,13 +986,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:
             - '*.*'
 
@@ -1007,6 +1058,9 @@
           project: '{project}'
       - gerrit-parameter:
           branch: '{branch}'
+      - gerrit-refspec-parameter
+      - gerrit-event-type-parameter
+      - gerrit-event-comment-text-parameter
       - csit-perf-trial-duration-parameter:
           csit-perf-trial-duration: "{csit-perf-trial-duration}"
       - csit-perf-trial-multiplicity-parameter:
@@ -1034,13 +1088,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:
             - '*.*'