Merge "Configure release helm job"
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index e8fb13a..2697d18 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -199,7 +199,7 @@
- lf-provide-maven-settings-cleanup
- job-template:
- name: '{project-name}-{stream}-stage-helm'
+ name: '{project-name}-{stream}-release-helm'
# Job template for Helm stage jobs
<<: *helm_job_boiler_plate
@@ -211,12 +211,10 @@
submodule-recursive: '{submodule-recursive}'
triggers:
- - pollscm:
- cron: '0 22 * * *'
- gerrit:
trigger-on:
- comment-added-contains-event:
- comment-contains-value: '^stage-helm$'
+ comment-contains-value: '^release-helm$'
builders:
- lf-infra-pre-build
@@ -229,7 +227,7 @@
server-id: oom-helm
- inject:
properties-content: |
- BUILD_TYPE=staging
+ BUILD_TYPE=release
- shell: '{obj:post_build_script}'
- lf-provide-maven-settings-cleanup
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 9263a28..46da258 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -18,7 +18,6 @@
cd kubernetes/
make HELM_BIN=helm3 common
make HELM_BIN=helm3 {subproject}
- oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
stream:
- "master":
@@ -50,9 +49,8 @@
build-timeout: 240
- "{project-name}-{stream}-merge-helm":
build_script: "{oom_build_script}"
- post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
files: "**"
- - "{project-name}-{stream}-stage-helm":
+ - "{project-name}-{stream}-release-helm":
build_script: "{oom_build_script}"
post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
files: "**"