[OOM] Upgrade oom versions

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

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 8336695..0d896a2 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -14,23 +14,25 @@
       set -e -o pipefail
       cd kubernetes/
       make HELM_BIN=$HELM_BIN all
-    subproject_build_script: |
+    oom_build_script_skip_lint: |
       #!/bin/bash
+      source helm.prop
+      set -e -o pipefail
       cd kubernetes/
-      make HELM_BIN=$HELM_BIN common
-      make HELM_BIN=$HELM_BIN {subproject}
+      make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all
 
     stream:
       - "master":
           branch: "master"
+      - "jakarta":
+          branch: "jakarta"
       - "istanbul":
           branch: "istanbul"
-      - "honolulu":
-          branch: "honolulu"
+
 
     helm_bin:
-      - helm3.5
-      - helm3.3
+      - helm3.6
+      - helm3.8
 
     exclude: []
     subproject: []
@@ -40,26 +42,15 @@
           files: "**"
       - "{project-name}-{stream}-verify-{helm_bin}":
           build_script: "{oom_build_script}"
-          files: "**"
-          build-timeout: 600
+          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: 600
+          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: "**"
-          build-timeout: 600
-
-      # 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