X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=964abf5165143352835bdd695520af8a631cd3eb;hb=6b7742eb7b8c8b229fd6f0a834de5bc2fd9c4ec1;hp=2d7a1fe315b794f3497ad526206ecfd247ccbc11;hpb=2bad5c0629f130e09acb0225df6abfacfc760969;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 2d7a1fe3..964abf51 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -22,7 +22,7 @@
 - builder:
     name: lf-fetch-dependent-patches
     builders:
-      - shell: !include-raw: ../shell/gerrit-fetch-dependencies.sh
+      - shell: !include-raw-escape: ../shell/gerrit-fetch-dependencies.sh
       - inject:
           properties-file: $WORKSPACE/.dependency.properties
 
@@ -42,7 +42,7 @@
 - builder:
     name: lf-infra-capture-instance-metadata
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/capture-instance-metadata.sh
 
 - builder:
@@ -100,11 +100,11 @@
           # Ensure python-tools are installed in case job template does not
           # call the lf-infra-pre-build macro.
           - ../shell/python-tools-install.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/sudo-logs.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/job-cost.sh
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/logs-deploy.sh
       - shell: !include-raw:
           - ../shell/logs-clear-credentials.sh
@@ -114,7 +114,7 @@
 - builder:
     name: lf-infra-package-listing
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/package-listing.sh
 
 - builder:
@@ -179,7 +179,7 @@
 - builder:
     name: lf-infra-update-packer-images
     builders:
-      - shell: !include-raw: ../shell/update-cloud-images.sh
+      - shell: !include-raw-escape: ../shell/update-cloud-images.sh
 
 - builder:
     name: lf-infra-push-gerrit-patch
@@ -197,7 +197,7 @@
 - builder:
     name: lf-infra-sysstat
     builders:
-      - shell: !include-raw:
+      - shell: !include-raw-escape:
           - ../shell/sysstat.sh
 
 - builder:
@@ -343,7 +343,7 @@
           files:
             - file-id: lftoolsini
               target: "$HOME/.config/lftools/lftools.ini"
-      - shell: !include-raw: ../shell/release-job.sh
+      - shell: !include-raw-escape: ../shell/release-job.sh
 
 - builder:
     name: lf-sigul-sign-dir
@@ -393,6 +393,7 @@
           properties: "{sonar-properties}"
           java-opts: "{sonar-java-opts}"
           additional-arguments: "{sonar-additional-args}"
+          jdk: "{sonar-jdk}"
 
 - builder:
     name: lf-infra-sonar-with-prescan
@@ -472,6 +473,19 @@
           default: "{make-opts}"
           description: "Options to pass to make. Example: -j8"
 
+- parameter:
+    name: lf-gerrit-event-comment-text-parameter
+    # GERRIT_EVENT_COMMENT_TEXT parameter is usually provided
+    # by the triggering gerrit comment.
+    # Having it as parameter is useful for "Build with parameters",
+    # for example when testing (otherwise gerrit comment triggered)
+    # jobs on Sandbox.
+    parameters:
+      - string:
+          name: GERRIT_EVENT_COMMENT_TEXT
+          default: "{comment-text}"
+          description: "Simulated gerrit comment when triggering manually."
+
 - parameter:
     name: lf-infra-maven-parameters
     parameters: