Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / jjb / lf-ci-jobs.yaml

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0bfacdf..eca0429 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -101,7 +101,7 @@
     disable-job: false
     github-url: "https://github.com"
     jjb-cache: "$HOME/.cache/jenkins_jobs"
-    jjb-version: 5.0.4
+    jjb-version: 6.3.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -628,6 +628,8 @@
       - lf-infra-jjb-parameters:
           jjb-cache: "{jjb-cache}"
           jjb-version: "{jjb-version}"
+      - lf-gerrit-event-comment-text-parameter:
+          comment-text: "$GERRIT_EVENT_COMMENT_TEXT"
 
     wrappers:
       - lf-infra-wrappers:
@@ -651,12 +653,12 @@
     scm:
       - lf-infra-gerrit-scm:
           git-url: "{git-url}"
-          refspec: "refs/heads/{branch}"
+          refspec: "$GERRIT_REFSPEC"
           branch: "{branch}"
           submodule-recursive: true
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: default
+          choosing-strategy: gerrit
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
@@ -1576,6 +1578,10 @@
                   pattern: 'packer\/common-packer\/templates\/{templates}\.json'
                 - compare-type: REG_EXP
                   pattern: 'packer\/common-packer\/vars\/{platforms}\.json'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/templates\/{templates}\.hcl'
+                - compare-type: REG_EXP
+                  pattern: 'packer\/common-packer\/vars\/{platforms}\.pkrvars.hcl'
 
 - job-template:
     name: "{project-name}-packer-merge-{platforms}-{templates}"
@@ -2170,7 +2176,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    sonarcloud-java-version: openjdk13
+    sonarcloud-java-version: openjdk17
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
@@ -2182,6 +2188,7 @@
     sonar-properties: ""
     sonar-java-opts: ""
     sonar-additional-args: ""
+    sonar-jdk: openjdk17
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -2234,6 +2241,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
 - _lf_sonar_builders_prescan: &lf_sonar_builders_prescan
     name: lf-sonar-builders-prescan
@@ -2261,6 +2269,7 @@
           sonar-properties: "{sonar-properties}"
           sonar-java-opts: "{sonar-java-opts}"
           sonar-additional-args: "{sonar-additional-args}"
+          sonar-jdk: "{sonar-jdk}"
 
 - _lf_sonar_gerrit_common: &lf_sonar_gerrit_common
     name: lf-sonar-gerrit-common