[OOM] Use specific HELM_BIN depending on branch
Guilin branch supports only helm < 3.4 whereas helm master supports helm
<=3.5.x
Therefore, we must be able to choose the right binary for each branch.
Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I2c193a477f3a920f402d72ece9e2a814a27f756a
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 46da258..6a3fed2 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -12,12 +12,12 @@
#!/bin/bash
set -e -o pipefail
cd kubernetes/
- make HELM_BIN=helm3 all
+ make all
subproject_build_script: |
#!/bin/bash
cd kubernetes/
- make HELM_BIN=helm3 common
- make HELM_BIN=helm3 {subproject}
+ make common
+ make {subproject}
stream:
- "master":
@@ -42,11 +42,18 @@
files: "**"
- "{project-name}-{stream}-verify-helm2":
files: "**"
- build-timeout: 240
+ build-timeout: 360
- "{project-name}-{stream}-verify-helm":
build_script: "{oom_build_script}"
files: "**"
- build-timeout: 240
+ build-timeout: 360
+ stream: master
+ - "{project-name}-{stream}-verify-helm":
+ build_script: "{oom_build_script}"
+ files: "**"
+ build-timeout: 360
+ stream: guilin
+ helm_bin: "helm3.3"
- "{project-name}-{stream}-merge-helm":
build_script: "{oom_build_script}"
files: "**"