X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-helm.yaml;h=475efa0cbaa59e2856c2c19bc9f02f576e14b17d;hb=da493c28ee77d885c28a768040612454bdfc4985;hp=664d14ea36ddd426777e55d4a2c3c3785202a80c;hpb=b8dc611f81fad3b1d921754fc5262ca35b2959ad;p=ci-management.git

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 664d14ea3..475efa0cb 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -1,4 +1,15 @@
 ---
+############
+# BUILDERS #
+############
+
+- builder:
+    name: oom-create-netrc
+    builders:
+      - inject:
+          properties-content: "SERVER_ID={server-id}"
+      - shell: !include-raw-escape: ../shell/oom-create-netrc.sh
+
 ###########
 # ANCHORS #
 ###########
@@ -13,9 +24,13 @@
     submodule-recursive: true
 
     # default params for helm jobs
-    pre_build_script: ''
     build_script: ''
+    git-url: '$GIT_URL/$PROJECT'
     post_build_script: ''
+    pre_build_script: ''
+    submodule-disable: false
+    submodule-timeout: 10
+    build-timeout: 240
 
     #####################
     # Job Configuration #
@@ -47,10 +62,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
 
     scm:
       - gerrit-trigger-scm:
@@ -64,10 +80,13 @@
           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}'
 
@@ -95,9 +114,11 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
-      - lf-infra-create-netrc:
+      - oom-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
@@ -106,7 +127,99 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-{stream}-stage-helm'
+    name: '{project-name}-{stream}-verify-external-helm'
+    # Job template for helm verify jobs
+
+    <<: *helm_job_boiler_plate
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: 'oom'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_BRANCH'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
+          choosing-strategy: default
+
+    triggers:
+      - gerrit-trigger-helm-patch-submitted:
+          status-context: '{project}-Helm-Verify'
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - inject:
+          properties-content: 'HELM_MODULE={helm-module}'
+      - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > helm.prop
+      - shell: '{obj:pre_build_script}'
+      - shell: '{obj:build_script}'
+
+- job-template:
+    name: '{project-name}-{stream}-merge-external-helm'
+    # Job template for Helm merge jobs
+
+    <<: *helm_job_boiler_plate
+
+    parameters:
+      - lf-infra-parameters:
+          branch: '{branch}'
+          project: 'oom'
+          stream: '{stream}'
+          lftools-version: '{lftools-version}'
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
+          refspec: '$GERRIT_BRANCH'
+          branch: '$GERRIT_BRANCH'
+          submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
+          choosing-strategy: default
+
+    triggers:
+      - gerrit-trigger-helm-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '{files}'
+
+    builders:
+      - lf-infra-pre-build
+      - inject:
+          properties-content: 'HELM_MODULE={helm-module}'
+      - lf-provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > 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
 
     <<: *helm_job_boiler_plate
@@ -118,25 +231,35 @@
           submodule-recursive: '{submodule-recursive}'
 
     triggers:
-      - pollscm:
-          cron: '0 22 * * *'
       - gerrit:
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: '^stage-helm$'
+                comment-contains-value: '^Patch Set\s+\d+:\s+release-helm\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=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
-      - lf-infra-create-netrc:
+      - oom-create-netrc:
           server-id: oom-helm
       - inject:
           properties-content: |
-            BUILD_TYPE=staging
+            BUILD_TYPE=release
       - shell: '{obj:post_build_script}'
       - lf-provide-maven-settings-cleanup
 
@@ -149,6 +272,8 @@
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -162,8 +287,13 @@
     disabled: true
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
+      - inject:
+          properties-content: |
+            BUILD_TYPE=snapshot
       - shell: '{post_build_script}'
 
 - job-template:
@@ -182,10 +312,14 @@
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: true
+          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: '{submodule-disable}'
           choosing-strategy: default
 
     builders:
       - lf-infra-pre-build
+      - shell: |
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -197,4 +331,3 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-