X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=3820a2e3bf34fe68f786ff5e996ef840baf8bc6a;hb=a24ad567a740f4f4ac82a794edf0528a58620daf;hp=fa0120282d630ed60b58de0a94ace45639fcf791;hpb=dc4922932780f79df731bc68d4f156f618d2fd25;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index fa012028..3820a2e3 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -76,6 +76,8 @@
           # 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/sudo-logs.sh
       - shell: !include-raw:
           - ../shell/logs-deploy.sh
       - shell: !include-raw:
@@ -332,7 +334,21 @@
           sonar-name: Sonar
           scanner-name: SonarQubeScanner
           task: "{sonar-task}"
-          project: "sonar-project.properties"
+          project: "{sonar-project-file}"
+          properties: "{sonar-properties}"
+          java-opts: "{sonar-java-opts}"
+          additional-arguments: "{sonar-additional-args}"
+
+- builder:
+    name: lf-infra-sonar-with-prescan
+    # Run a Sonar Jenkins Plugin
+    builders:
+      - lf-sonar-prescan # Must be defined by caller
+      - sonar:
+          sonar-name: Sonar
+          scanner-name: SonarQubeScanner
+          task: "{sonar-task}"
+          project: "{sonar-project-file}"
           properties: "{sonar-properties}"
           java-opts: "{sonar-java-opts}"
           additional-arguments: "{sonar-additional-args}"
@@ -507,10 +523,13 @@
           name: LOG_DIR
           default: ""
           description: "Log dir, example: project-maven-stage-master/17/"
-      - string:
+      - choice:
           name: DISTRIBUTION_TYPE
-          default: ""
-          description: "Set to maven for build with parametes"
+          choices:
+            - None
+            - container
+            - maven
+          description: "Set to maven for build with parameters"
       - bool:
           name: USE_RELEASE_FILE
           default: "{use-release-file}"