diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2022-12-01 14:52:39 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2022-12-05 11:04:42 +0000 |
| commit | 0d19d3bfb1d47d3dcd5fe5a6db3a8445c5a1007c (patch) | |
| tree | 82e79679154900d9c17f5536fdff25ad671b01a1 /jjb/oom | |
| parent | d2caae62864c6fa0a1c6d7518811464dd6124d69 (diff) | |
[HELM] Clean up and fix oom helm jobs
Change-Id: I44c198e86f09f06d4ccd6e8b89c111ee49ebee2c
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: OOM-3065
Diffstat (limited to 'jjb/oom')
| -rw-r--r-- | jjb/oom/oom-helm.yaml | 59 | ||||
| -rw-r--r-- | jjb/oom/oom-main-linter.yaml | 1 |
2 files changed, 35 insertions, 25 deletions
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 40eca918c..6a38faa63 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -3,23 +3,12 @@ name: oom project-name: oom project: oom + archive-artifacts: "" mvn-settings: oom-settings mvn-global-settings: global-settings - archive-artifacts: "" build-node: ubuntu1804-helm-2c-1g - 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 HELM_BIN=$HELM_BIN all - oom_build_script_skip_lint: | - #!/bin/bash - source helm.prop - set -e -o pipefail - cd kubernetes/ - make HELM_BIN=$HELM_BIN SKIP_LINT=TRUE all + helm_bin: helm3.8 + pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh stream: - "master": @@ -29,23 +18,43 @@ - "jakarta": branch: "jakarta" - helm_bin: - - helm3.8 - jobs: - "{project-name}-{stream}-image-verify": files: "**" - "{project-name}-{stream}-verify-{helm_bin}": - build_script: "{oom_build_script}" - files: "kubernetes/**" + build_script: !include-raw-escape: shell/helm/make-helm-all.sh + files: "**/kubernetes/**" build-timeout: 900 - "{project-name}-{stream}-merge-helm": - build_script: "{oom_build_script}" - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: "kubernetes/**" + build_type: snapshot + build_script: !include-raw-escape: shell/helm/make-helm-all.sh + post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh + files: "**/kubernetes/**" build-timeout: 900 - "{project-name}-{stream}-release-helm": - build_script: "{oom_build_script_skip_lint}" - post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: "kubernetes/**" + build_type: release + build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh + post_build_script: !include-raw-escape: shell/helm/publish_helm_charts.sh + files: "**/kubernetes/**" + build-timeout: 900 + +- project: + name: oom-helm-verify-make-latest + project-name: oom + project: oom + archive-artifacts: "" + build-node: ubuntu1804-helm-2c-1g + helm_bin: helm3.10.2 + pre_build_script: !include-raw-escape: shell/helm/helm-repo-init.sh + + stream: + - "master": + branch: "master" + - "kohn": + branch: "kohn" + + jobs: + - "{project-name}-{stream}-verify-make-{helm_bin}": + build_script: !include-raw-escape: shell/helm/make-helm-skip-lint.sh + files: "**/kubernetes/**" build-timeout: 900 diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml index 0f49ead3a..21e670613 100644 --- a/jjb/oom/oom-main-linter.yaml +++ b/jjb/oom/oom-main-linter.yaml @@ -1,3 +1,4 @@ +--- - project: name: oom-main-linters project: oom |