diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2022-11-17 14:27:18 -0500 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2022-11-28 14:39:17 -0500 |
commit | 9336e2d1f5678dda74d5740418e616fe5837609e (patch) | |
tree | 6f320a8bc14afaf1ed46a9159666363cb2ce631b /jjb/global-macros.yaml | |
parent | 814ce6bdf330fdfda90d3856211887c5be515d89 (diff) |
Enable upload of vpp & hicn verify docs to s3 7day retention bucket
- Use the same bucket path as logs so that the docs can be viewed by
s/s3-logs/s3-docs-7day/ in the URL after selecting the logs URL from
the jenkins job page.
- Also, fix error output of get_gerrit_refspec bash function.
Change-Id: I73e8b7a1f310dbfb031afe9d164b114021c2cfe3
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/global-macros.yaml')
-rw-r--r-- | jjb/global-macros.yaml | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index c2c24ca1..ca925ebc 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -754,10 +754,10 @@ - publisher: name: fdio-infra-publish-docs - # macro to finish up a build. + # macro to finish up a docs build. # # Handles the following: - # - Shipping docs S3 logs repository + # - Mapping docs S3 bucket credentials for merge job docs upload # - Cleanup workspace publishers: - postbuildscript: @@ -780,6 +780,33 @@ fail-build: false - publisher: + name: fdio-infra-publish-docs-7day + # macro to finish up a verify docs build. + # + # Handles the following: + # - Mapping 7-day retention S3 bucket credentials for verify job docs upload + # - Cleanup workspace + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - NOT_BUILT + - SUCCESS + - UNSTABLE + build-steps: + - fdio-infra-ship-docs-7day + mark-unstable-if-failed: true + - workspace-cleanup: + exclude: + # Do not clean up *.jenkins-trigger files for jobs that use a + # properties file as input for triggering another build. + - "**/*.jenkins-trigger" + fail-build: false + +- publisher: name: fdio-infra-publish # macro to finish up a build. # @@ -864,6 +891,20 @@ - ../global-jjb/shell/logs-clear-credentials.sh - builder: + name: fdio-infra-ship-docs-7day + builders: + - config-file-provider: + files: + - file-id: "jenkins-s3-vpp-docs-ship" + target: $HOME/.aws/credentials + - shell: !include-raw: + - scripts/terraform_s3_docs_ship.sh + - shell: !include-raw: + - scripts/publish_docs.sh + - shell: !include-raw: + - ../global-jjb/shell/logs-clear-credentials.sh + +- builder: name: fdio-infra-ship-logs builders: - config-file-provider: |