X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom%2Foom-helm.yaml;h=0d896a2b206843ba68ec8b4cf54d27c00bff41a9;hb=c3c78f609f2fc0189fd8eb27dc9b16f95e645cc0;hp=46da25852adf7f1d857b286bdcc32ea1436f5e7a;hpb=f4f78ae24e975e7eb9f5f884b5324f37d59a6b30;p=ci-management.git

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 46da25852..0d896a2b2 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -10,58 +10,47 @@
     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
-    subproject_build_script: |
+      make HELM_BIN=$HELM_BIN all
+    oom_build_script_skip_lint: |
       #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
       cd kubernetes/
-      make HELM_BIN=helm3 common
-      make HELM_BIN=helm3 {subproject}
+      make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all
 
     stream:
       - "master":
           branch: "master"
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
+      - "jakarta":
+          branch: "jakarta"
+      - "istanbul":
+          branch: "istanbul"
+
+
+    helm_bin:
+      - helm3.6
+      - helm3.8
 
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
+    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
+          files: "kubernetes/**"
+          build-timeout: 900
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
+          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
+          build-timeout: 900
       - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
+          build_script: "{oom_build_script_skip_lint}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
-
-      # Below jobs disabled until future need.
-      - "{project-name}-{subproject}-{stream}-verify-helm2":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{subproject}-{stream}-verify-helm":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{subproject}-{stream}-merge-helm":
-          build_script: "{subproject_build_script}"
-      - "{project-name}-{stream}-update-helm-weekly":
-          build_script: "{oom_build_script}"
-          files: "**"
+          build-timeout: 900