VPP: convert beta jobs to global macros

Convert to global macro defined trigger that I should have
used in the first place

Change-Id: I106ea8786e9aea1466f8dd1254f22c5371c3e7c7
Signed-off-by: Ed Kern <ejk@cisco.com>

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index 9f89750..fd4afb0 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -638,11 +638,11 @@
           build-timeout: 120
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'betacheck'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betacheck'
+          name: '{project}'
+          branch: '{branch}'
+
     builders:
       - shell:
           !include-raw-escape:
@@ -1007,11 +1007,11 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'betamerge'
+      - gerrit-trigger-manually-triggered:
+          comment-trigger-value: 'betamerge'
+          name: '{project}'
+          branch: '{branch}'
+
     builders:
       - config-file-provider:
           files: