diff options
| author |   Eric Ball <eball@linuxfoundation.org> | 2021-02-10 17:57:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-02-10 17:57:32 +0000 |
| commit | 80060bbde8f595671af74339d80c2b3e679016eb (patch) | |
| tree | cb5898292eb9e2a67ce31006a4efd5bab649b5ff | |
| parent | 8aae29e611728ab693a9ae9c5df69f2b6b22b4f8 (diff) | |
| parent | 0da65b9dc6569394f4ef3b0586fa408cd2368496 (diff) | |
Merge "[OOM] Use specific HELM_BIN depending on branch"
| -rw-r--r-- | jjb/global-templates-helm.yaml | 4 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 2697d1871..7d4541f37 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -56,6 +56,7 @@ <<: *helm_job_boiler_plate concurrent: true + helm_bin: helm3 scm: - gerrit-trigger-scm: @@ -69,10 +70,13 @@ server: '{server-name}' project: '{project}' branch: '{branch}' + helm_bin: '{helm_bin}' files: '{files}' builders: - lf-infra-pre-build + - inject: + properties-content: 'HELM_BIN={helm_bin}' - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' 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: "**" |