Make custom helm verify and merge triggers

Issue-ID: CIMAN-164
Change-Id: Idf308e2440742def006efefe9478058449543590
Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>

1 files changed, 2 insertions, 12 deletions

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index d7cc056e5..d412d9ba3 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -59,16 +59,12 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - gerrit-trigger-patch-submitted:
+      - gerrit-trigger-helm-patch-submitted:
           status-context: '{project}-Helm-Verify'
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '{files}'
-      - gerrit:
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: '^verify-helm$'
 
     builders:
       - shell: '{obj:pre_build_script}'
@@ -87,17 +83,11 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - gerrit-trigger-patch-merged:
+      - gerrit-trigger-helm-patch-merged:
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '{files}'
-      - pollscm:
-          cron: ''
-      - gerrit:
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: '^remerge-helm$'
 
     builders:
       - lf-provide-maven-settings: