diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2020-11-26 10:25:06 +0100 |
|---|---|---|
| committer |   Tibor Frank <tifrank@cisco.com> | 2020-12-03 05:04:03 +0000 |
| commit | 9198e921f049160d4ba854858ad08e73dca9eaf0 (patch) | |
| tree | 4f65ad1aee27d82086f6fa4ea4478c1b3ec18bcf /resources/libraries/bash/entry/per_patch_device.sh | |
| parent | f89bc7a87e0b6015e50de3557a1724c8aaafbf60 (diff) | |
Avoid ci-management archiving files twice
This is a follow-up to https://gerrit.fd.io/r/c/csit/+/20394
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 directtories,
usually archives/ and archives/archive/.
This change renames copy_archives to move_archives,
with few workarounds to support multiple calls.
I also renamed ARCHIVE_DIR value from $CSIT_DIR/archive
to $CSIT_DIR/archives to make "move" operation look natural.
Finally, download_builds function is being removed,
as after recent improvements to VPP compilation speed
nobody seems to be using it.
Change-Id: I19a429e1dfdfaab7fcf32a9609963b1aebd33c6c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit 523c6e6e24101206ff1318ca17c310dff8b3c9d2)
Diffstat (limited to 'resources/libraries/bash/entry/per_patch_device.sh')
| -rw-r--r-- | resources/libraries/bash/entry/per_patch_device.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/resources/libraries/bash/entry/per_patch_device.sh b/resources/libraries/bash/entry/per_patch_device.sh index 65577c2909..01e4de0089 100644 --- a/resources/libraries/bash/entry/per_patch_device.sh +++ b/resources/libraries/bash/entry/per_patch_device.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -24,7 +24,7 @@ set -exuo pipefail # + Everything needed to build VPP is already installed locally. # Consequences: # + The following directories (relative to VPP repo) are (re)created: -# ++ csit_current, build_current, archive, csit/archive, csit_download_dir. +# ++ csit_current, build_current, archives, csit/archives, csit_download_dir. # TODO: Implement some kind of VPP build caching. @@ -56,6 +56,6 @@ activate_docker_topology || die select_vpp_device_tags || die compose_pybot_arguments || die run_pybot || die -copy_archives || die +move_archives || die archive_test_results "csit_current" || die die_on_pybot_error || die |