X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=11a827de989176da9e04d0522bd0e7e298a5bcfa;hb=c3150dcea8069e284ec52bf487541576a62687ab;hp=fb179926f9816cf0246f67c70b0cec59e7105f3f;hpb=757650c835599c0aa4fe62ed99f05eab324c6f37;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index fb179926..11a827de 100644
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -86,6 +86,19 @@
       - shell: !include-raw:
           - ../shell/packer-clear-credentials.sh
 
+- builder:
+    name: lf-infra-push-gerrit-patch
+    builders:
+      - inject:
+          properties-content: |
+              PROJECT='{project}'
+              GERRIT_COMMIT_MESSAGE='{gerrit-commit-message}'
+              GERRIT_HOST='{gerrit-host}'
+              GERRIT_TOPIC='{gerrit-topic}'
+              GERRIT_USER='{gerrit-user}'
+              REVIEWERS_EMAIL='{reviewers-email}'
+      - shell: !include-raw-escape: ../shell/gerrit-push-patch.sh
+
 - builder:
     name: lf-infra-sysstat
     builders:
@@ -165,12 +178,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 +198,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 +397,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