Update 3n-tsh mrr daily periodicity

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

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index cc722f5..d4f7b65 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Copyright (c) 2019 PANTHEON.tech s.r.o. and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,69 +18,89 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-vpp-perf-verify-{stream}-{node-arch}'
-      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+      - 'csit-dpdk-perf-verify-{stream}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+               executor: 'ubuntu1804arm-us'
+      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
           node-arch:
             - ''
             - -2n-clx
             - -2n-skx
-            - -2n-dnv
             - -3n-skx
-            - -3n-dnv
+          periodicity: '0 0 * * 6'
+      - 'csit-vpp-perf-verify-{stream}-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
+            - 2n-dnv
+            - 3n-skx
+            - 3n-hsw
+            - 3n-dnv
+            - 3n-tsh:
+               executor: 'ubuntu1804arm-us'
+      - 'csit-vpp-perf-mrr-daily-master{node-arch}':
+          node-arch:
+            - '':
+                periodicity: '0 14 * * *'
+            - -2n-clx:
+                periodicity: '0 14 * * *'
+            - -2n-skx:
+                periodicity: '0 14 * * 1,4'
+            - -2n-dnv:
+                periodicity: '0 14 * * *'
+            - -3n-skx:
+                periodicity: '0 14 * * 1,4'
+            - -3n-dnv:
+                periodicity: '0 14 * * *'
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                vpp-mrr-daily-periodicity: '0 14 * * 0'
-      - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
+                periodicity: '0 14 * * *'
+      - 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
+            - 3n-skx
+          stream:
+            - master:
+                branch: 'master'
+                branch-id: 'oper'
+            - '1908':
+                branch: 'rls1908'
+                branch-id: 'oper-rls1908'
+          periodicity: '0 0 * * 6'
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
             - 2n-clx
             - 2n-skx
             - 3n-skx
             - 3n-hsw
-      - 'csit-dpdk-perf-verify-{stream}-{node-arch}'
-      - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
-          node-arch:
-            - ''
-            - -2n-clx
-            - -2n-skx
-            - -3n-skx
+          periodicity: '0 0 * * 6'
 
     project: 'csit'
     executor: 'ubuntu1804-us'
-    ligato-executor: 'ubuntu1804-basebuild-4c-4g'
     branch: 'master'
     branch-id: 'oper'
-    vpp-mrr-daily-periodicity: '0 2,14 * * *'
     csit-perf-trial-duration: "1.0"
     csit-perf-trial-multiplicity: "10"
     stream:
       - master:
           branch: 'master'
           branch-id: 'oper'
-          executor: 'ubuntu1804-us'
-      - '1904':
-          branch: 'rls1904'
-          branch-id: 'oper-rls1904'
-          executor: 'ubuntu1804-us'
       - '1908_1':
           branch: 'rls1908_1'
           branch-id: 'oper-rls1908_1'
-          executor: 'ubuntu1804-us'
-
+      - '2001':
+          branch: 'rls2001'
+          branch-id: 'oper-rls2001'
     build-artifact-num-to-keep: 10
-    node-arch:
-      - 2n-clx
-      - 2n-skx
-      - 2n-dnv
-      - 3n-skx
-      - 3n-hsw
-      - 3n-dnv
-      - 3n-tsh:
-          executor: 'ubuntu1804arm-us'
-          ligato-executor: 'ubuntu1804arm-us'
+
 
 - job-template:
     name: 'csit-vpp-perf-verify-{stream}-{node-arch}'
@@ -173,26 +193,16 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'csit-{node-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
+      - gerrit-trigger-csit-perftest:
+          project: '{project}'
+          branch: '{branch}'
+          trigger-word: 'csit-{node-arch}-perftest'
+          skip-vote: false
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
@@ -259,14 +269,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '{vpp-mrr-daily-periodicity}'
+      - timed: '{periodicity}'
 
     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
+          !include-raw-escape:
+          - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
@@ -278,7 +289,7 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-weekly-master-{node-arch}'
+    name: 'csit-vpp-perf-mrr-weekly-{stream}-{node-arch}'
 
     description: |
       <ul>
@@ -333,14 +344,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     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
+          !include-raw-escape:
+          - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
@@ -402,14 +414,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     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
+          !include-raw-escape:
+          - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot:
@@ -517,7 +530,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: jjb/csit/include-raw-csit-perf-verify.sh
+          !include-raw-escape:
+          - ../scripts/csit/perf-verify.sh
 
     publishers:
       - robot:
@@ -584,14 +598,15 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '0 0 * * 6'
+      - timed: '{periodicity}'
 
     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
+          !include-raw-escape:
+          - ../scripts/csit/perf-timed.sh
 
     publishers:
       - robot: