Merge "RTD Allow projects to change their default-version"

diff --combined jjb/lf-macros.yaml
index e505d87,9411345..1c4e5f4
--- 1/jjb/lf-macros.yaml
--- 2/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@@ -78,8 -78,6 +78,8 @@@
            - ../shell/python-tools-install.sh
        - shell: !include-raw:
            - ../shell/sudo-logs.sh
 +      - shell: !include-raw:
 +          - ../shell/job-cost.sh
        - shell: !include-raw:
            - ../shell/logs-deploy.sh
        - shell: !include-raw:
@@@ -278,21 -276,11 +278,11 @@@
  
  - 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
+       - inject:
+           properties-content: |
+             DEFAULT_VERSION={default-version}
+       - shell: !include-raw: ../shell/rtdv3.sh
  
  - builder:
      name: check-info-votes