X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom%2Foom-helm.yaml;h=0753e1cdc222e8dfcdc75572c8720027e1746b4b;hb=16578968fe2a98480070acc9bed7343e4ed6ca34;hp=46da25852adf7f1d857b286bdcc32ea1436f5e7a;hpb=deac12ecb6c3fbcc65c676604142c86d06d9f897;p=ci-management.git

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 46da25852..0753e1cdc 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -3,65 +3,58 @@
     name: oom
     project-name: oom
     project: oom
+    archive-artifacts: ""
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
-    archive-artifacts: ""
-    build-node: ubuntu1804-helm-2c-1g
-    pre_build_script: !include-raw-escape: shell/helm-repo-init.sh
-    oom_build_script: |
-      #!/bin/bash
-      set -e -o pipefail
-      cd kubernetes/
-      make HELM_BIN=helm3 all
-    subproject_build_script: |
-      #!/bin/bash
-      cd kubernetes/
-      make HELM_BIN=helm3 common
-      make HELM_BIN=helm3 {subproject}
+    build-node: ubuntu2004-helm-2c-1g
+    helm_bin: helm3.8
+    pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh
 
     stream:
       - "master":
           branch: "master"
-      - "guilin":
-          branch: "guilin"
-      - "frankfurt":
-          branch: "frankfurt"
-      - "dublin":
-          branch: "dublin"
-      - "casablanca":
-          branch: "casablanca"
-
-    subproject:
-      - "aai":
-          files: "kubernetes/aai/**"
-      - "robot":
-          files: "kubernetes/robot/**"
+      - "kohn":
+          branch: "kohn"
+      - "london":
+          branch: "london"
 
     jobs:
       - "{project-name}-{stream}-image-verify":
           files: "**"
-      - "{project-name}-{stream}-verify-helm2":
-          files: "**"
-          build-timeout: 240
-      - "{project-name}-{stream}-verify-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 240
+      - "{project-name}-{stream}-verify-{helm_bin}":
+          build_script: !include-raw-escape: shell/helm/make-helm-all.sh
+          files: "**/kubernetes/**"
+          build-timeout: 900
       - "{project-name}-{stream}-merge-helm":
-          build_script: "{oom_build_script}"
-          files: "**"
+          build_type: snapshot
+          build_script: !include-raw-escape: shell/helm/make-helm-all.sh
+          post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh
+          files: "**/kubernetes/**"
+          build-timeout: 900
       - "{project-name}-{stream}-release-helm":
-          build_script: "{oom_build_script}"
-          post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
-          files: "**"
+          build_type: release
+          build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh
+          post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh
+          files: "**/kubernetes/**"
+          build-timeout: 900
 
-      # 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: "**"
+- project:
+    name: oom-helm-verify-make-latest
+    project-name: oom
+    project: oom
+    archive-artifacts: ""
+    build-node: ubuntu2004-helm-2c-1g
+    helm_bin: helm3.10.2
+    pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh
+
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+
+    jobs:
+      - "{project-name}-{stream}-verify-make-{helm_bin}":
+          build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh
+          files: "**/kubernetes/**"
+          build-timeout: 900