Merge "Enable SBOM on etsicatalog project"

[ci-management.git] / jjb / global-templates-helm.yaml

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 0e5986a..475efa0 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -115,7 +115,7 @@
           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}'
       - oom-create-netrc:
@@ -164,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}'
 
@@ -207,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: |
@@ -232,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
@@ -242,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: |
@@ -263,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}'
@@ -278,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:
@@ -309,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}'