X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=c5fa0f49d7dd227c758b3dfe355ccb27e5ec6bb3;hb=536325e5186cf8883d630feaea2d91591b39fd50;hp=14c239338209f00c176656549747ded58dbfce79;hpb=ed320523c5e3c70a6f54cf9f57369f8305f9b342;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 14c23933..c5fa0f49 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -165,12 +165,12 @@
           #!/bin/bash
           set +e  # DO NOT cause build failure if any of the rm calls fail.
 
-          rm "$GLOBAL_SETTINGS_FILE" "$SETTINGS_FILE"
+          rm -f "$GLOBAL_SETTINGS_FILE" "$SETTINGS_FILE"
 
           # In some cases we use the lf-provide-maven-settings macro to produce
           # a "$HOME/.netrc" file containing credentials. Remove that file here
           # too if it exists.
-          rm "$HOME/.netrc"
+          rm -f "$HOME/.netrc"
 
           # DO NOT fail build if any of the above lines fail.
           exit 0
@@ -185,7 +185,9 @@
     name: lf-rtd-trigger-build
     builders:
       - inject:
-          properties-content: RTD_PROJECT={rtd-project}
+          properties-content: |
+            RTD_BUILD_URL={rtd-build-url}
+            RTD_TOKEN={rtd-token}
       - shell: !include-raw-escape: ../shell/rtd-trigger-build.sh
 
 - builder:
@@ -382,11 +384,17 @@
     publishers:
       - postbuildscript:
           builders:
-            - lf-infra-sysstat
-            - lf-infra-ship-logs
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: false
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - NOT_BUILT
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - lf-infra-sysstat
+                - lf-infra-ship-logs
+          mark-unstable-if-failed: true
       - workspace-cleanup:
           exclude:
             # Do not clean up *.jenkins-trigger files for jobs that use a
@@ -470,3 +478,5 @@
           files:
             - file-id: npmrc
               target: '$HOME/.npmrc'
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'