X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=69848114b87275ce1f5be7e7d9fa588cbf6f828e;hb=0bc0e976068e17a1274aa3a7417c425cb2518660;hp=fa0120282d630ed60b58de0a94ace45639fcf791;hpb=4028ad2bc487460837736f040d885c3674b39031;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index fa012028..69848114 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:
@@ -272,6 +274,24 @@
       - shell: !include-raw-escape: ../shell/tox-install.sh
       - shell: !include-raw-escape: ../shell/rtd-verify.sh
 
+- builder:
+    name: lf-rtdv3-build
+
+    builders:
+      - conditional-step:
+          condition-kind: file-exists
+          condition-filename: .readthedocs.yaml
+          on-evaluation-failure: dont-run
+          steps:
+            - inject:
+                properties-content: |
+                  TOX_ENVS=docs,docs-linkcheck
+            - lf-infra-pre-build
+            - lf-infra-tox-install:
+                python-version: "python3"
+            - shell: !include-raw: ../shell/tox-run.sh
+            - shell: !include-raw: ../shell/rtdv3.sh
+
 - builder:
     name: check-info-votes
     builders:
@@ -332,7 +352,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}"
@@ -502,15 +536,22 @@
       - string:
           name: VERSION
           default: ""
-          description: "This is the tag, Example: 1.0.0"
+          description: "Version to release, for example: 1.0.0"
       - string:
-          name: LOG_DIR
+          name: GIT_TAG
           default: ""
-          description: "Log dir, example: project-maven-stage-master/17/"
+          description: "Tag to push to git repo; optional, defaults to VERSION"
       - string:
-          name: DISTRIBUTION_TYPE
+          name: LOG_DIR
           default: ""
-          description: "Set to maven for build with parametes"
+          description: "Log dir, for example: project-maven-stage-master/17/"
+      - choice:
+          name: DISTRIBUTION_TYPE
+          choices:
+            - None
+            - container
+            - maven
+          description: "Set to maven for build with parameters"
       - bool:
           name: USE_RELEASE_FILE
           default: "{use-release-file}"