Update global-jjb

[ci-management.git] / jjb / global-templates-helm.yaml

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index d7cc056..6c139dd 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -16,6 +16,7 @@
     pre_build_script: ''
     build_script: ''
     post_build_script: ''
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
@@ -55,22 +56,19 @@
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
+          choosing-strategy: 'gerrit'
           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:
+      - lf-infra-pre-build
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -82,24 +80,19 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
           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-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -121,7 +114,7 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
+          refspec: ''
           choosing-strategy: 'default'
           submodule-recursive: '{submodule-recursive}'
 
@@ -134,6 +127,7 @@
                 comment-contains-value: '^stage-helm$'
 
     builders:
+      - lf-infra-pre-build
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
@@ -155,6 +149,7 @@
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -167,6 +162,7 @@
 
     disabled: true
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -187,16 +183,18 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     builders:
+      - lf-infra-pre-build
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
 
     triggers:
       # 11 AM UTC
-      - timed: 'H 11 * * *'
+      - timed: '@daily'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'