Merge "Modify logs publisher"

[ci-management.git] / jjb / vpp / vpp-macros.yaml

diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml
index bb35466..eb491fa 100644 (file)
--- a/jjb/vpp/vpp-macros.yaml
+++ b/jjb/vpp/vpp-macros.yaml
@@ -46,7 +46,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'perftest'
+                comment-contains-value: 'perftest-{node-arch}'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'
@@ -60,13 +60,15 @@
             notbuilt: true
 
 - trigger:
-    name: gerrit-trigger-csit-virltest
+    name: gerrit-trigger-csit-devicetest-full
     triggers:
       - gerrit:
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'virltest'
+                comment-contains-value: 'checkstyle_success'
+            - comment-added-contains-event:
+                comment-contains-value: 'devicetest'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{name}'
@@ -74,7 +76,27 @@
                 - 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-devicetest-manual
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'devicetest'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: '{skip-vote}'
+            failed: '{skip-vote}'
+            unstable: '{skip-vote}'
+            notbuilt: '{skip-vote}'