diff options
Diffstat (limited to 'jjb/global-macros.yaml')
| -rw-r--r-- | jjb/global-macros.yaml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 2fcc4111b..eed5c0bed 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -667,7 +667,7 @@ build-steps: - shell: !include-raw: scripts/post_build_executor_info.sh - shell: !include-raw: scripts/post_build_deploy_archives.sh - - shell: !include-raw: scripts/backup_upload_archives.sh + - fdio-infra-ship-backup-logs - fdio-infra-ship-logs mark-unstable-if-failed: true - workspace-cleanup: @@ -725,6 +725,18 @@ num-to-keep: '{build-num-to-keep}' - builder: + name: fdio-infra-ship-backup-logs + builders: + - config-file-provider: + files: + - file-id: "jenkins-s3-log-ship" + variable: $HOME/.aws/credentials + - shell: !include-raw: + - scripts/logs_publish.sh + - shell: !include-raw: + - ../global-jjb/shell/logs-clear-credentials.sh + +- builder: name: fdio-infra-ship-logs builders: # Ensure no pre-existing .netrc files are overriding logs config @@ -750,7 +762,7 @@ - shell: !include-raw: - ../global-jjb/shell/logs-clear-credentials.sh - description-setter: - regexp: "(^(Nexus|S3) build logs: .*)" + regexp: "(^Nexus build logs: .*)" - builder: name: packer-validate |