Use the same perf triger for vpp and csit

+ Rename arguments.
+ Make skip-vote and trigger word configurable in the macro.
+ Keep the old skip-vote and trigger word values.
+ Improve vpp-csit job description highlighting the difference.

Change-Id: Ie9ca68d422f8514bc8b0cd79f36a83181911feb9
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index 5944311..34a8990 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -193,22 +193,11 @@
           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:

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 3d9c102..5247bfc 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -309,24 +309,24 @@
 
 - trigger:
     name: gerrit-trigger-csit-perftest
-    # Comes from VPP, for jobs that do performance testing using CSIT code.
+    # Manual trigger common for csit-vpp and vpp-csit perf jobs.
     triggers:
       - gerrit:
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'perftest-{node-arch}'
+                comment-contains-value: '{trigger-word}'
           projects:
             - project-compare-type: 'ANT'
-              project-pattern: '{name}'
+              project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
           skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
+            successful: '{skip-vote}'
+            failed: '{skip-vote}'
+            unstable: '{skip-vote}'
+            notbuilt: '{skip-vote}'
 
 - trigger:
     name: gerrit-trigger-csit-vpp-devicetest-full

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 339894f..5a8332f 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -1104,6 +1104,10 @@
               <ul>
                   <li>{executor}
               </ul>
+          <li>Objective
+          Contrary to csit-vpp job, this also measures the parent performance,
+          and fails if performance regression is detected.
+          See https://github.com/FDio/csit/blob/master/docs/cpta/methodology/perpatch_performance_tests.rst
       </ul>
 
     project-type: freestyle
@@ -1156,9 +1160,10 @@
 
     triggers:
       - gerrit-trigger-csit-perftest:
-          name: '{project}'
+          project: '{project}'
           branch: '{branch}'
-          node-arch: '{node-arch}'
+          trigger-word: 'perftest-{node-arch}'
+          skip-vote: true
 
     builders:
       - shell: