From ccfe499e2a27f2caf234ecbb2ec948120810eab6 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 2 Jul 2019 16:37:12 +0200
Subject: 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>
---
 resources/libraries/bash/entry/per_patch_perf.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'resources/libraries/bash/entry/per_patch_perf.sh')

diff --git a/resources/libraries/bash/entry/per_patch_perf.sh b/resources/libraries/bash/entry/per_patch_perf.sh
index 195d1a70e0..fd2d789d94 100644
--- a/resources/libraries/bash/entry/per_patch_perf.sh
+++ b/resources/libraries/bash/entry/per_patch_perf.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -70,7 +70,6 @@ for ((iter=0; iter<iterations; iter++)); do
     select_build "build_parent" || die
     check_download_dir || die
     run_pybot || die
-    copy_archives || die
     archive_parse_test_results "csit_parent/${iter}" || die
     die_on_pybot_error || die
     # TODO: Use less heavy way to avoid apt remove failures.
@@ -78,7 +77,6 @@ for ((iter=0; iter<iterations; iter++)); do
     select_build "build_current" || die
     check_download_dir || die
     run_pybot || die
-    copy_archives || die
     archive_parse_test_results "csit_current/${iter}" || die
     die_on_pybot_error || die
 done
-- 
cgit 1.2.3-korg