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/global-templates-helm.yaml | |
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/global-templates-helm.yaml')
-rw-r--r-- | jjb/global-templates-helm.yaml | 101 |
1 files changed, 55 insertions, 46 deletions
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 3ce9285ec..7b74b0eac 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -8,7 +8,14 @@ builders: - inject: properties-content: "SERVER_ID={server-id}" - - shell: !include-raw-escape: ../shell/oom-create-netrc.sh + - shell: !include-raw-escape: ../shell/helm/oom-create-netrc.sh + +- builder: + name: helm-install + builders: + - inject: + properties-content: "HELM_VER={helm_ver}" + - shell: !include-raw-escape: ../shell/helm/helm-install.sh ########### # ANCHORS # @@ -19,17 +26,12 @@ ###################### # Default parameters # ###################### - branch: master - submodule-recursive: true - # default params for helm jobs build_script: '' git-url: '$GIT_URL/$PROJECT' post_build_script: '' pre_build_script: '' - submodule-disable: false - submodule-timeout: 10 build-timeout: 240 ##################### @@ -49,12 +51,30 @@ project: '{project}' stream: '{stream}' lftools-version: '{lftools-version}' + - string: + name: HELM_BIN + default: '{helm_bin|helm3.8}' + - string: + name: BUILD_TYPE + default: '{build_type|snapshot}' wrappers: - lf-infra-wrappers: build-timeout: '{build-timeout}' jenkins-ssh-credential: '{jenkins-ssh-credential}' + builders: + - lf-infra-pre-build + - lf-provide-maven-settings: + global-settings-file: '{mvn-global-settings}' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + - oom-create-netrc: + server-id: oom-helm + - shell: '{obj:post_build_script}' + - lf-provide-maven-settings-cleanup + publishers: - lf-infra-publish @@ -76,20 +96,11 @@ triggers: - gerrit-trigger-helm-patch-submitted: - status-context: '{project}-Helm-Verify' server: '{server-name}' project: '{project}' branch: '{branch}' - helm_bin: '{helm_bin}' files: '{files}' - builders: - - lf-infra-pre-build - - shell: | - echo "export HELM_BIN={helm_bin}" > helm.prop - - shell: '{obj:pre_build_script}' - - shell: '{obj:build_script}' - - job-template: name: '{project-name}-{stream}-merge-helm' # Job template for Helm merge jobs @@ -107,26 +118,8 @@ server: '{server-name}' project: '{project}' branch: '{branch}' - helm_bin: '{helm_bin}' files: '{files}' - builders: - - lf-infra-pre-build - - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' - - shell: | - echo "export HELM_BIN={helm_bin}" > helm.prop - - shell: '{obj:pre_build_script}' - - shell: '{obj:build_script}' - - oom-create-netrc: - server-id: oom-helm - - inject: - properties-content: | - BUILD_TYPE=snapshot - - shell: '{obj:post_build_script}' - - lf-provide-maven-settings-cleanup - - job-template: name: '{project-name}-{stream}-release-helm' # Job template for Helm stage jobs @@ -141,7 +134,6 @@ triggers: - gerrit: - helm_bin: '{helm_bin}' server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: @@ -156,19 +148,36 @@ - compare-type: 'ANT' pattern: '**' +- job-template: + name: '{project-name}-{stream}-verify-make-{helm_bin}' + + <<: *helm_job_boiler_plate + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: + - comment-added-contains-event: + comment-contains-value: '^Patch Set\s+\d+:\s+helm-latest\s*$' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: 'ANT' + pattern: '**' + builders: - lf-infra-pre-build - - lf-provide-maven-settings: - global-settings-file: '{mvn-global-settings}' - settings-file: '{mvn-settings}' - - shell: | - echo "export HELM_BIN={helm_bin}" > helm.prop + - helm-install: + helm_ver: 3.10.2 - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - - oom-create-netrc: - server-id: oom-helm - - inject: - properties-content: | - BUILD_TYPE=release - - shell: '{obj:post_build_script}' - - lf-provide-maven-settings-cleanup |