[OOM] Fix helm3.x job generation

[ci-management.git] / jjb / oom / oom-helm.yaml

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 6a3fed2..eeeab15 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -10,14 +10,15 @@
     pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
     oom_build_script: |
       #!/bin/bash
+      source helm.prop
       set -e -o pipefail
       cd kubernetes/
-      make all
+      make HELM_BIN=$HELM_BIN all
     subproject_build_script: |
       #!/bin/bash
       cd kubernetes/
-      make common
-      make {subproject}
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
 
     stream:
       - "master":
@@ -37,23 +38,35 @@
       - "robot":
           files: "kubernetes/robot/**"
 
+    helm_bin:
+      - helm3.5
+      - helm3.3
+
+    exclude:
+      - stream: guilin
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.5
+      - stream: frankfurt
+        helm_bin: helm3.3
+      - stream: dublin
+        helm_bin: helm3.5
+      - stream: dublin
+        helm_bin: helm3.3
+      - stream: casablanca
+        helm_bin: helm3.5
+      - stream: casablanca
+        helm_bin: helm3.3
     jobs:
       - "{project-name}-{stream}-image-verify":
           files: "**"
       - "{project-name}-{stream}-verify-helm2":
           files: "**"
           build-timeout: 360
-      - "{project-name}-{stream}-verify-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 360
-          stream: master
-      - "{project-name}-{stream}-verify-helm":
+      - "{project-name}-{stream}-verify-{helm_bin}":
           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: "**"