Merge "Extend tag feature of release jobs"

[releng/global-jjb.git] / jjb / lf-macros.yaml

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 2fe9f22..6984811 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -275,13 +275,22 @@
       - shell: !include-raw-escape: ../shell/rtd-verify.sh
 
 - builder:
-    name: lf-rtdv2-build
+    name: lf-rtdv3-build
+
     builders:
-      - lf-infra-pre-build
-      - lf-infra-tox-install:
-          python-version: "python3"
-      - shell: !include-raw: ../shell/tox-run.sh
-      - shell: !include-raw: ../shell/rtdv2.sh
+      - 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
@@ -343,7 +352,7 @@
           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}"
@@ -357,7 +366,7 @@
           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}"
@@ -527,11 +536,15 @@
       - string:
           name: VERSION
           default: ""
-          description: "This is the tag, Example: 1.0.0"
+          description: "Version to release, for example: 1.0.0"
+      - string:
+          name: GIT_TAG
+          default: ""
+          description: "Tag to push to git repo; optional, defaults to VERSION"
       - string:
           name: LOG_DIR
           default: ""
-          description: "Log dir, example: project-maven-stage-master/17/"
+          description: "Log dir, for example: project-maven-stage-master/17/"
       - choice:
           name: DISTRIBUTION_TYPE
           choices: