X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=c5fa0f49d7dd227c758b3dfe355ccb27e5ec6bb3;hb=536325e5186cf8883d630feaea2d91591b39fd50;hp=9aa05e083e16b455c13e59c717b5b881aea8e72e;hpb=12d6179c0e7c208a360a3c61c0b715b49310b39e;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 9aa05e08..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 @@ -186,10 +186,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: