From e8aefe0eb92f35e76a6a0c64c04be9984f9d0edd Mon Sep 17 00:00:00 2001
From: Cedric Caffy <cedric.caffy@cern.ch>
Date: Thu, 18 Feb 2021 19:37:05 +0100
Subject: [PATCH] [CI] Added the "-s" flag to xrdfs prepare for repack tape
repair test
---
.../orchestration/tests/client_prepare_file.sh | 2 +-
.../orchestration/tests/repack_systemtest_wrapper.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/continuousintegration/orchestration/tests/client_prepare_file.sh b/continuousintegration/orchestration/tests/client_prepare_file.sh
index f39d5c0a7c..1c2f41e77c 100755
--- a/continuousintegration/orchestration/tests/client_prepare_file.sh
+++ b/continuousintegration/orchestration/tests/client_prepare_file.sh
@@ -40,7 +40,7 @@ nbFilesToRetrieve=${#FILES_LOCATION[@]}
KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0
-echo ${FILES_LOCATION[@]} | XrdSecPROTOCOL=krb5 KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 xargs --max-procs=10 -n 40 xrdfs ${EOSINSTANCE} prepare
+echo ${FILES_LOCATION[@]} | XrdSecPROTOCOL=krb5 KRB5CCNAME=/tmp/${EOSPOWER_USER}/krb5cc_0 xargs --max-procs=10 -n 40 xrdfs ${EOSINSTANCE} prepare -s
nbFilesRetrieved=0
SECONDS_PASSED=0
diff --git a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
index b44b21fef5..d1e2e7eb94 100755
--- a/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
+++ b/continuousintegration/orchestration/tests/repack_systemtest_wrapper.sh
@@ -549,7 +549,7 @@ repackTapeRepairNoRecall() {
echo "retrievedFiles ($retrievedFiles) == totalFilesToRetrieve ($totalFilesToRetrieve), OK"
fi
- if [[ $archivedFiles != $totalFilesToArchive ]]
+ if [[ $archivedFiles != $totalFilesToArchive || $userProvidedFiles != $archivedFiles ]]
then
echo "archivedFiles ($archivedFiles) != totalFilesToArchive ($totalFilesToArchive), test FAILED"
exit 1
--
GitLab