Merge "remove modeling-toscaparsers-nfvparser from JJB"

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

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 46da258..3c1329a 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -10,43 +10,36 @@
     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}
+      make HELM_BIN=$HELM_BIN common
+      make HELM_BIN=$HELM_BIN {subproject}
 
     stream:
       - "master":
           branch: "master"
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
+      - "honolulu":
+          branch: "honolulu"
 
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
+    helm_bin:
+      - helm3.5
+      - helm3.3
+
+    exclude: []
+    subproject: []
 
     jobs:
       - "{project-name}-{stream}-image-verify":
           files: "**"
-      - "{project-name}-{stream}-verify-helm2":
-          files: "**"
-          build-timeout: 240
-      - "{project-name}-{stream}-verify-helm":
+      - "{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}"
           files: "**"