From 019550b4d5450aab8748798d247ebb36e8032746 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 21 Dec 2020 12:24:30 -0800
Subject: Configure release helm job

We might not need the stage helm job, but instead we
need a release helm that calls the publish script.

Re-configure stage helm to perform like a release helm job.
Trigger the job only on "release-helm" comments and prevent
it from triggering after every merge.

Issue-ID: CIMAN-33
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I7232f4a8668939e0c24644fe77165d5326d72a7b
---
 jjb/global-templates-helm.yaml | 8 +++-----
 jjb/oom/oom-helm.yaml          | 4 +---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index e8fb13a47..2697d1871 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 9263a28a0..46da25852 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: "**"
-- 
cgit 1.2.3-korg