X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=529254c92ad81c113ea92f0eb796897c38d9a5ab;hb=e313cb04f2c7255dcc5429c16afd391d62db1ff7;hp=2fe9f228c78b49a95ee4214516588cb358a75427;hpb=d60a07de920a48e44fa34242c774e3a9f04250dc;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 2fe9f228..529254c9 100644
--- 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}"