X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=1c4e5f401cf988082e2707e7d76d3e3b9dbe4706;hb=9bbd8bf9729d82dce060cacbb28e684d59ef1b4a;hp=452c36a35be6be457c1c59968ad8a1e171a8c880;hpb=4a2f4b8c7279c39f04e4e06473615325b6e1eade;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 452c36a3..1c4e5f40 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -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:
@@ -275,13 +277,12 @@
       - 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
+      - inject:
+          properties-content: |
+            DEFAULT_VERSION={default-version}
+      - shell: !include-raw: ../shell/rtdv3.sh
 
 - builder:
     name: check-info-votes
@@ -527,11 +528,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: