X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom%2Foom-helm.yaml;h=0f8142658b7d72fc9fc942aae58cc1151b61e323;hb=59ee068d6cd2a6dfc99e60cecbfddcf31ef9d29c;hp=eeeab1568304e8e5bcb4e1bbcf60258eb6f5619e;hpb=8a80b0912813fd1105b5baa9e904946d57f0285c;p=ci-management.git

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index eeeab1568..0f8142658 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -3,85 +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
-      source helm.prop
-      set -e -o pipefail
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
-      #!/bin/bash
-      cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {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"
+      - "jakarta":
+          branch: "jakarta"
 
-    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_bin}":
-          build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 360
+          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"
+      - "kohn":
+          branch: "kohn"
+
+    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