summaryrefslogtreecommitdiffstats
path: root/jjb/global-macros.yaml
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-07-08 12:34:33 +0000
committerPeter Mikus <pmikus@cisco.com>2021-08-05 14:45:31 +0000
commit37a55a05cd6ac7ca15bbb99f5ddc9ca61874d5f8 (patch)
tree238f6ba28684a78dd1d0a8724148f4b930872b40 /jjb/global-macros.yaml
parentc841491aa2a606ce68867a6e05f5d9cf1dbb6d9f (diff)
Global: Rework archive artifacts
This patch removes archive-artifacts-parameter macro and ARCHVIVE_ARTIFACTS env var from csit and vpp project. All project specific artifacts to be uploaded with the log files SHOULD BE copied to $WORKSPACE/archives. The next step once this is merged will be to remove NEXUS entirely via JCasC. + Remove archive-artifacts from all csit/vpp yaml files. + Add fdio-infra-ship-backup-logs macro + Remove unused jjb/include-raw-deploy-archives.sh + CSIT: - copy job artifacts to $WORKSPACE/archives + HC2VPP - remove CSIT + TLDK: - remove CSIT Signed-off-by: pmikus <pmikus@cisco.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: Iada020cf269714c34f9ce32d764d991827e3b003
Diffstat (limited to 'jjb/global-macros.yaml')
-rw-r--r--jjb/global-macros.yaml16
1 files changed, 14 insertions, 2 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 2fcc4111..eed5c0be 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