Merge "[AAI] Update babel to use maven 3.6"

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

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 9263a28..504f7f4 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -10,15 +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 HELM_BIN=helm3 all
+      make HELM_BIN=$HELM_BIN all
     subproject_build_script: |
       #!/bin/bash
       cd kubernetes/
-      make HELM_BIN=helm3 common
-      make HELM_BIN=helm3 {subproject}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
 
     stream:
       - "master":
@@ -38,21 +38,42 @@
       - "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: 240
-      - "{project-name}-{stream}-verify-helm":
+          build-timeout: 360
+          stream:
+            - guilin
+            - frankfurt
+      - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
           files: "**"
-          build-timeout: 240
+          build-timeout: 360
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
-      - "{project-name}-{stream}-stage-helm":
+      - "{project-name}-{stream}-release-helm":
           build_script: "{oom_build_script}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"