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

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 69848114..94847dcf 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -70,6 +70,15 @@
           files:
             - file-id: "jenkins-log-archives-settings"
               variable: "SETTINGS_FILE"
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "^.*logs-s3.*"
+          label: $S3_BUCKET
+          steps:
+            - config-file-provider:
+                files:
+                  - file-id: "jenkins-s3-log-ship"
+                    target: $HOME/.aws/credentials
       - lf-infra-create-netrc:
           server-id: logs
       - shell: !include-raw:
@@ -78,6 +87,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:
@@ -231,13 +242,6 @@
             - file-id: "{settings-file}"
               variable: "SETTINGS_FILE"
 
-- builder:
-    name: lf-pip-install
-    builders:
-      - inject:
-          properties-content: PIP_PACKAGES={pip-packages}
-      - shell: !include-raw-escape: ../shell/pip-install.sh
-
 - builder:
     name: lf-provide-maven-settings-cleanup
     builders:
@@ -276,21 +280,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-escape: ../shell/rtdv3.sh
 
 - builder:
     name: check-info-votes