X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-helm.yaml;h=7d4541f3724ae430481283ed0a1e047d454e66e5;hb=2c44be82f28ba984ac4142693c131cde06682d7b;hp=f5c6bcde4d8964d83a780f336edd78c1eef96633;hpb=73d08bd00b5ea45cfb60f25eea2241398b0d77e4;p=ci-management.git

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index f5c6bcde4..7d4541f37 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -17,8 +17,9 @@
     git-url: '$GIT_URL/$PROJECT'
     post_build_script: ''
     pre_build_script: ''
-    submodule-recursive: true
+    submodule-disable: false
     submodule-timeout: 10
+    build-timeout: 240
 
     #####################
     # Job Configuration #
@@ -54,6 +55,8 @@
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
+    concurrent: true
+    helm_bin: helm3
 
     scm:
       - gerrit-trigger-scm:
@@ -67,10 +70,13 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
+          helm_bin: '{helm_bin}'
           files: '{files}'
 
     builders:
       - lf-infra-pre-build
+      - inject:
+          properties-content: 'HELM_BIN={helm_bin}'
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -129,6 +135,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
@@ -168,6 +175,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     triggers:
@@ -195,7 +203,7 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-{stream}-stage-helm'
+    name: '{project-name}-{stream}-release-helm'
     # Job template for Helm stage jobs
 
     <<: *helm_job_boiler_plate
@@ -207,12 +215,10 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - pollscm:
-          cron: '0 22 * * *'
       - gerrit:
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: '^stage-helm$'
+                comment-contains-value: '^release-helm$'
 
     builders:
       - lf-infra-pre-build
@@ -225,7 +231,7 @@
           server-id: oom-helm
       - inject:
           properties-content: |
-            BUILD_TYPE=staging
+            BUILD_TYPE=release
       - shell: '{obj:post_build_script}'
       - lf-provide-maven-settings-cleanup
 
@@ -272,6 +278,7 @@
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
           submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
@@ -287,4 +294,3 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-