Merge "Update Helm node"

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 2697d18..7d4541f 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -56,6 +56,7 @@
 
     <<: *helm_job_boiler_plate
     concurrent: true
+    helm_bin: helm3
 
     scm:
       - gerrit-trigger-scm:
@@ -69,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}'
 

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 46da258..6a3fed2 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -12,12 +12,12 @@
       #!/bin/bash
       set -e -o pipefail
       cd kubernetes/
-      make HELM_BIN=helm3 all
+      make all
     subproject_build_script: |
       #!/bin/bash
       cd kubernetes/
-      make HELM_BIN=helm3 common
-      make HELM_BIN=helm3 {subproject}
+      make common
+      make {subproject}
 
     stream:
       - "master":
@@ -42,11 +42,18 @@
           files: "**"
       - "{project-name}-{stream}-verify-helm2":
           files: "**"
-          build-timeout: 240
+          build-timeout: 360
       - "{project-name}-{stream}-verify-helm":
           build_script: "{oom_build_script}"
           files: "**"
-          build-timeout: 240
+          build-timeout: 360
+          stream: master
+      - "{project-name}-{stream}-verify-helm":
+          build_script: "{oom_build_script}"
+          files: "**"
+          build-timeout: 360
+          stream: guilin
+          helm_bin: "helm3.3"
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
           files: "**"