X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Foom%2Foom-helm.yaml;h=2d06faa2cbfc8d874d7db599e01f74fdde7cfb13;hb=82a545a8c5e21bfa21339044ef62e4c3feea032e;hp=5a7d377a11c5a7a6b6531e1452311cb8d0618d21;hpb=fa0fb85381038891aa3247ede745b3a263d3eae2;p=ci-management.git

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 5a7d377a1..2d06faa2c 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -5,109 +5,51 @@
     project: oom
     mvn-settings: oom-settings
     mvn-global-settings: global-settings
-    archive-artifacts: ''
-    build-node: ubuntu1604-helm-2c-1g
+    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/
-        if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-          echo "[ERROR] Only release images are allowed in helm charts."
-          exit 1
-        fi
-        make all
-    subproject_build_script: |
-        #!/bin/bash
-        cd kubernetes/
-        if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then
-          echo "[ERROR] Only release images are allowed in helm charts."
-          exit 1
-        fi
-        make common
-        make {subproject}
-    oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
+      #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
+      cd kubernetes/
+      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=$HELM_BIN SKIP_LINT=TRUE all
 
     stream:
-      - 'master':
-          branch: 'master'
-      - 'casablanca':
-          branch: 'casablanca'
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "istanbul":
+          branch: "istanbul"
 
-    subproject:
-      - 'aaf':
-          files: 'kubernetes/aaf/**'
-      - 'aai':
-          files: 'kubernetes/aai/**'
-      - 'appc':
-          files: 'kubernetes/appc/**'
-      - 'clamp':
-          files: 'kubernetes/clamp/**'
-      - 'cli':
-          files: 'kubernetes/cli/**'
-      - 'common':
-          files: 'kubernetes/common/**'
-      - 'consul':
-          files: 'kubernetes/consul/**'
-      - 'dcaegen2':
-          files: 'kubernetes/dcaegen2/**'
-      - 'dmaap':
-          files: 'kubernetes/dmaap/**'
-      - 'esr':
-          files: 'kubernetes/esr/**'
-      - 'log':
-          files: 'kubernetes/log/**'
-      - 'msb':
-          files: 'kubernetes/msb/**'
-      - 'multicloud':
-          files: 'kubernetes/multicloud/**'
-      - 'nbi':
-          files: 'kubernetes/nbi/**'
-      - 'oof':
-          files: 'kubernetes/oof/**'
-      - 'policy':
-          files: 'kubernetes/policy/**'
-      - 'portal':
-          files: 'kubernetes/portal/**'
-      - 'readiness':
-          files: 'kubernetes/readiness/**'
-      - 'robot':
-          files: 'kubernetes/robot/**'
-      - 'sdc':
-          files: 'kubernetes/sdc/**'
-      - 'sdnc':
-          files: 'kubernetes/sdnc/**'
-      - 'sniro-emulator':
-          files: 'kubernetes/sniro-emulator/**'
-      - 'so':
-          files: 'kubernetes/so/**'
-      - 'uui':
-          files: 'kubernetes/uui/**'
-      - 'vfc':
-          files: 'kubernetes/vfc/**'
-      - 'vid':
-          files: 'kubernetes/vid/**'
-      - 'vnfsdk':
-          files: 'kubernetes/vnfsdk/**'
+
+    helm_bin:
+      - helm3.8
+
+    exclude: []
+    subproject: []
 
     jobs:
-      - '{project-name}-{stream}-verify-helm':
-          build_script: '{oom_build_script}'
-          files: '**'
-      - '{project-name}-{stream}-merge-helm':
-          build_script: '{oom_build_script}'
+      - "{project-name}-{stream}-image-verify":
+          files: "**"
+      - "{project-name}-{stream}-verify-{helm_bin}":
+          build_script: "{oom_build_script}"
+          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: '**'
-      - '{project-name}-{stream}-stage-helm':
-          build_script: '{oom_build_script}'
+          files: "**"
+          build-timeout: 900
+      - "{project-name}-{stream}-release-helm":
+          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-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: '**'
+          files: "**"
+          build-timeout: 900