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

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 1c4e5f40..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:
@@ -233,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:
@@ -282,7 +284,7 @@
       - inject:
           properties-content: |
             DEFAULT_VERSION={default-version}
-      - shell: !include-raw: ../shell/rtdv3.sh
+      - shell: !include-raw-escape: ../shell/rtdv3.sh
 
 - builder:
     name: check-info-votes