X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fglobal-templates-helm.yaml;h=475efa0cbaa59e2856c2c19bc9f02f576e14b17d;hb=refs%2Fchanges%2F52%2F131252%2F1;hp=25e3921aec78712226f4ff79f282f7dc9e2b04f3;hpb=07d7ca431507f48ef15ae5e2b2aeb584d3a1abaa;p=ci-management.git

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 25e3921ae..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 #
 ###########
@@ -104,10 +115,10 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          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: |
@@ -153,7 +164,7 @@
           properties-content: 'HELM_MODULE={helm-module}'
       - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{obj:pre_build_script}'
       - shell: '{obj:build_script}'
 
@@ -196,10 +207,10 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          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: |
@@ -221,9 +232,19 @@
 
     triggers:
       - gerrit:
+          server-name: '{gerrit-server-name}'
           trigger-on:
             - comment-added-contains-event:
                 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
@@ -231,10 +252,10 @@
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          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: |
@@ -252,7 +273,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'
@@ -267,7 +288,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - inject:
@@ -298,7 +319,7 @@
     builders:
       - lf-infra-pre-build
       - shell: |
-          echo "export HELM_BIN=helm3.5" > helm.prop
+          echo "export HELM_BIN=helm3.6" > helm.prop
       - shell: '{pre_build_script}'
       - shell: '{build_script}'
       - shell: '{post_build_script}'