diff options
| author |   pmikus <pmikus@cisco.com> | 2021-09-09 12:19:25 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-09-14 06:33:22 +0000 |
| commit | 9b69c8fd2589680391ff010d849277b3cf4c898c (patch) | |
| tree | 04c4671895096d5f57373788ac1c03d7aa3eed55 /jjb/global-macros.yaml | |
| parent | 46428e54f4fe49517338c6889b62896fc98441ae (diff) | |
Docs: Cleanup
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I9209a4c739feb9aae713d0f3654d3cf6fa04c92d
Diffstat (limited to 'jjb/global-macros.yaml')
| -rw-r--r-- | jjb/global-macros.yaml | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index ea0e367d..e00d42df 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -812,60 +812,44 @@ $WORKSPACE/scripts/check-unicode.sh jjb/ - builder: - name: fdio-infra-ship-docs + name: fdio-infra-ship-backup-logs builders: - config-file-provider: files: - - file-id: "jenkins-log-archives-settings" - variable: "SETTINGS_FILE" - - config-file-provider: - files: - - file-id: "jenkins-s3-docs-ship" + - file-id: "jenkins-s3-log-ship" target: $HOME/.aws/credentials - shell: !include-raw: - scripts/publish_library_py.sh - shell: !include-raw: - - scripts/publish_docs.sh + - scripts/publish_backup_logs.sh - shell: !include-raw: - ../global-jjb/shell/logs-clear-credentials.sh - builder: - name: fdio-infra-ship-backup-logs + name: fdio-infra-ship-docs builders: - config-file-provider: files: - - file-id: "jenkins-s3-log-ship" - variable: $HOME/.aws/credentials + - file-id: "jenkins-s3-docs-ship" + target: $HOME/.aws/credentials - shell: !include-raw: - scripts/publish_library_py.sh - shell: !include-raw: - - scripts/publish_logs.sh + - scripts/publish_docs.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 - - lf-provide-maven-settings-cleanup - config-file-provider: files: - - file-id: "jenkins-log-archives-settings" - variable: "SETTINGS_FILE" - - conditional-step: - condition-kind: regex-match - regex: "^.*logs-s3.*" - label: $S3_BUCKET - on-evaluation-failure: dont-run - steps: - - config-file-provider: - files: - - file-id: "jenkins-s3-log-ship" - target: $HOME/.aws/credentials - - lf-infra-create-netrc: - server-id: logs + - file-id: "jenkins-s3-log-ship" + target: $HOME/.aws/credentials + - shell: !include-raw: + - scripts/publish_library_py.sh - shell: !include-raw: - - ../global-jjb/shell/logs-deploy.sh + - scripts/publish_logs.sh - shell: !include-raw: - ../global-jjb/shell/logs-clear-credentials.sh - description-setter: |