diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-17 13:49:17 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-17 13:49:17 +0100 |
| commit | 8a80b0912813fd1105b5baa9e904946d57f0285c (patch) | |
| tree | b41038f13694d9f40b4168a153fa64908b191203 /jjb/oom | |
| parent | 8b56f76a637e283e66b4142adf65db0950e3e9d1 (diff) | |
[OOM] Fix helm3.x job generation
It appeared that helm3.x job generation wasn't good.
This patch takes another approach that should help with that.
Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I80a841f82195ee2975023fda34d23e4cf11185fa
Diffstat (limited to 'jjb/oom')
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 6a3fed219..eeeab1568 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -10,14 +10,15 @@ 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 all + make HELM_BIN=$HELM_BIN all subproject_build_script: | #!/bin/bash cd kubernetes/ - make common - make {subproject} + make HELM_BIN=$HELM_BIN common + make HELM_BIN=$HELM_BIN {subproject} stream: - "master": @@ -37,23 +38,35 @@ - "robot": files: "kubernetes/robot/**" + 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": - build_script: "{oom_build_script}" - files: "**" - build-timeout: 360 - stream: master - - "{project-name}-{stream}-verify-helm": + - "{project-name}-{stream}-verify-{helm_bin}": 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: "**" |