diff options
| -rw-r--r-- | jjb/aai/aai-oom.yaml | 8 | ||||
| -rw-r--r-- | jjb/global-templates-helm.yaml | 21 | ||||
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 35 |
3 files changed, 44 insertions, 20 deletions
diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 2b87b1cd2..e60cd01f9 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -17,8 +17,6 @@ post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: '**' stream: - - 'master': - branch: 'master' - 'guilin': branch: 'guilin' @@ -31,10 +29,10 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ - make HELM_BIN=helm3 all + make HELM_BIN=helm3.3 all build_script: | #!/bin/bash cd kubernetes/ - make HELM_BIN=helm3 common - make HELM_BIN=helm3 {helm-module} + make HELM_BIN=helm3.3 common + make HELM_BIN=helm3.3 {helm-module} oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 7d4541f37..4f7db3386 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -51,12 +51,11 @@ # JOB TEMPLATES # ################# - job-template: - name: '{project-name}-{stream}-verify-helm' + name: '{project-name}-{stream}-verify-{helm_bin}' # Job template for helm verify jobs <<: *helm_job_boiler_plate concurrent: true - helm_bin: helm3 scm: - gerrit-trigger-scm: @@ -75,8 +74,8 @@ builders: - lf-infra-pre-build - - inject: - properties-content: 'HELM_BIN={helm_bin}' + - shell: | + echo "export HELM_BIN={helm_bin}" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -104,6 +103,8 @@ - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: @@ -151,6 +152,8 @@ - inject: properties-content: 'HELM_MODULE={helm-module}' - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' @@ -192,6 +195,8 @@ - lf-provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: @@ -225,6 +230,8 @@ - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - lf-infra-create-netrc: @@ -244,6 +251,8 @@ disabled: true builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -257,6 +266,8 @@ disabled: true builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' @@ -283,6 +294,8 @@ builders: - lf-infra-pre-build + - shell: | + echo "export HELM_BIN=helm3.5" > helm.prop - shell: '{pre_build_script}' - shell: '{build_script}' - shell: '{post_build_script}' 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: "**" |