Rework trigger and macro

Change-Id: I50b3294345b4a6838da8f58658245bb7567347f8
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 688a329..89e7d8a 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -57,17 +57,9 @@
       artifact-num-to-keep: 5
 
     triggers:
-      - gerrit-trigger-patch-submitted:
+      - gerrit-trigger-patch-submitted-manual-verified:
             name: 'AGL/{project}'
             branch: '**/**/**'
-            gerrit-build-started-verified-value: 0
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: 0
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
 
     wrappers:
       - agl-infra-wrappers:

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index c9fc7b8..22a2e73 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -105,6 +105,44 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
 
+- trigger:
+    name: gerrit-trigger-patch-submitted-manual-verified
+    triggers:
+      - gerrit:
+          server-name: 'gerrit.automotivelinux.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'true'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'rebuild'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+            - comment-added-contains-event:
+                comment-contains-value: 'RECHECK'
+            - comment-added-contains-event:
+                comment-contains-value: 'REBUILD'
+            - comment-added-contains-event:
+                comment-contains-value: 'REVERIFY'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{name}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          gerrit-build-started-verified-value: 0
+          gerrit-build-successful-verified-value: 1
+          gerrit-build-failed-verified-value: 0
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
 - trigger:
     name: gerrit-trigger-patch-submitted-silent
     triggers: