diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-09 09:42:42 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-10 07:50:22 +0100 |
| commit | 0da65b9dc6569394f4ef3b0586fa408cd2368496 (patch) | |
| tree | 710811de62f106de689cfdb03d5eee3461658568 /jjb/oom | |
| parent | 47840984f104127b1d2f52b4d210b1a23e3b33fb (diff) | |
[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
Diffstat (limited to 'jjb/oom')
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 46da25852..6a3fed219 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: "**" |