X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=ef5cbd76534637d8a48b3d39374a86defd4296ae;hb=9f181f00651deda2c37ff6824d9dfde0dd47e955;hp=9aa05e083e16b455c13e59c717b5b881aea8e72e;hpb=12d6179c0e7c208a360a3c61c0b715b49310b39e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 9aa05e08..ef5cbd76 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
@@ -186,10 +199,8 @@
     builders:
       - inject:
           properties-content: |
-            RTD_PROJECT={rtd-project}
             RTD_BUILD_URL={rtd-build-url}
-            SETTINGS_FILE={global-settings-file}
-            SERVER_ID={rtd-server-id}
+            RTD_TOKEN={rtd-token}
       - shell: !include-raw-escape: ../shell/rtd-trigger-build.sh
 
 - builder:
@@ -208,6 +219,16 @@
     builder:
       - shell: !include-raw-escape: ../shell/sigul-install.sh
 
+- builder:
+    name: lf-infra-provide-docker-cleanup
+    builders:
+      - shell: |
+          #!/bin/bash
+          set +e  # DO NOT cause build failure if docker rmi fails
+          docker rmi -f $(docker images -a -q)
+          exit 0
+
+
 ##############
 # PARAMETERS #
 ##############