X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcsit%2Fcsit-perf.yaml;h=d2dd176fe4218844349081a44c2196efcf630f72;hb=6224b91c7b65e8a0b89bffd3df394c0e9358d857;hp=eaeb87ea6541bb357a28860120ce6a82cb8944b6;hpb=e2f1847cf6a0e4de95970bce4d57e626d6d5abb0;p=ci-management.git

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index eaeb87ea6..d2dd176fe 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,6 +34,7 @@
             - ''
             - -2n-clx
             - -2n-skx
+            - -2n-zn2
             - -3n-skx
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
@@ -42,6 +44,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -63,23 +66,28 @@
             - '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 2 * * 1,3,5'
+                periodicity: '0 2,14 * * *'
             - -2n-clx:
-                periodicity: '0 2 * * 1,3,5'
+                periodicity: '0 2,14 * * *'
             - -2n-skx:
-                periodicity: '0 2 * * 1,3,5'
+                periodicity: '0 2,14 * * *'
             - -2n-dnv:
-                periodicity: '0 2 * * 1,4'
+                periodicity: '0 2,14 * * *'
+            - -2n-zn2:
+                periodicity: '0 2,14 * * *'
             - -3n-skx:
-                periodicity: '0 2 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -3n-dnv:
-                periodicity: '0 2 * * 1,4'
+                periodicity: '0 2,14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                periodicity: '0 2 * * 4'
+                periodicity: '0 14 * * *'
       - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
@@ -92,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:
@@ -105,6 +116,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -115,6 +127,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -125,6 +138,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -135,6 +149,7 @@
             - 2n-clx
             - 2n-skx
             - 2n-dnv
+            - 2n-zn2
             - 3n-skx
             - 3n-hsw
             - 3n-dnv
@@ -160,6 +175,9 @@
       - '2009':
           branch: 'rls2009'
           branch-id: 'oper-rls2009'
+      - '2009_lts':
+          branch: 'rls2009_lts'
+          branch-id: 'oper-rls2009_lts'
     stream_report:
       - '2009':
           branch: 'rls2009'
@@ -266,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:
             - '*.*'
 
@@ -341,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:
             - '*.*'
 
@@ -416,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:
             - '*.*'
 
@@ -486,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:
             - '*.*'
 
@@ -584,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:
             - '*.*'
 
@@ -659,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:
             - '*.*'
 
@@ -728,6 +764,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:
@@ -755,13 +794,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:
             - '*.*'
 
@@ -824,6 +866,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:
@@ -851,13 +896,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:
             - '*.*'
 
@@ -920,6 +968,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:
@@ -947,13 +998,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:
             - '*.*'
 
@@ -1016,6 +1070,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:
@@ -1043,13 +1100,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:
             - '*.*'