diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2019-07-02 16:37:12 +0200 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2019-07-12 12:56:28 +0000 |
| commit | ccfe499e2a27f2caf234ecbb2ec948120810eab6 (patch) | |
| tree | 3d3e7712eaaec0e8218dba1e69523d19b06b1fe9 /resources/libraries/bash/function | |
| parent | 15929dcefb20cdf782e0cfaac9ef0667c203d87b (diff) | |
Avoid ci-management archiving files twice
https://gerrit.fd.io/r/20119
has changed the way archival works,
everything should now go to logs.fd.io
(instead of appearing on run page in jenkins.fd.io).
The glob pattern for archiving is quite eager,
doing recursive search. That is good, as it can find
also misplaced useful outputs.
But it also means our usage of copy_archives function
creates two copies of archived directories,
usually archives/ and archives/archive/.
This change simply removes copy_archives,
relying on the new recursive search.
A solution with changing ARCHIVE_DIR and moving if needed
would be better, but looking at amout of jobs
and various func bootstraps, it is not worth the effort.
Change-Id: Iad2bc09455944307e59eecafa64d1db6dc8befe8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/bash/function')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index ae00886955..b0b97e0040 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -282,31 +282,6 @@ function compose_pybot_arguments () { } -function copy_archives () { - - # Create additional archive if workspace variable is set. - # This way if script is running in jenkins all will be - # automatically archived to logs.fd.io. - # - # Variables read: - # - WORKSPACE - Jenkins workspace, copy only if the value is not empty. - # Can be unset, then it speeds up manual testing. - # - ARCHIVE_DIR - Path to directory with content to be copied. - # Directories updated: - # - ${WORKSPACE}/archives/ - Created if does not exist. - # Content of ${ARCHIVE_DIR}/ is copied here. - # Functions called: - # - die - Print to stderr and exit. - - set -exuo pipefail - - if [[ -n "${WORKSPACE-}" ]]; then - mkdir -p "${WORKSPACE}/archives/" || die "Archives dir create failed." - cp -rf "${ARCHIVE_DIR}"/* "${WORKSPACE}/archives" || die "Copy failed." - fi -} - - function deactivate_docker_topology () { # Deactivate virtual vpp-device topology by removing containers. |