From e11f903872c442085aadea83cbfaf648fbfbd82f Mon Sep 17 00:00:00 2001
From: Oana Vickey Boeriu <Oana.Boeriu@cern.ch>
Date: Wed, 25 Apr 2018 13:18:16 +0200
Subject: [PATCH] Added the modified copy RPMs to eos from master to sync it
with branch 21.0.
Former-commit-id: d26eb6c833a3a80da4d15296e76e548a8e2f7e6d
---
Build/AtlasBuildScripts/copy_rpm_eos.sh | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Build/AtlasBuildScripts/copy_rpm_eos.sh b/Build/AtlasBuildScripts/copy_rpm_eos.sh
index 9253ac2ef52..cef9c84b85b 100755
--- a/Build/AtlasBuildScripts/copy_rpm_eos.sh
+++ b/Build/AtlasBuildScripts/copy_rpm_eos.sh
@@ -58,6 +58,7 @@ if [ "$WEEKDAY" = "" ]; then
else
DDAY=${WEEKDAY}
fi
+
echo "====================================================="
echo "=== STARTING RPMs copy to /eos at `date`"
echo "====================================================="
@@ -80,13 +81,18 @@ _retry_() {
return 0
}
-
if [ ! -d ${DESTDIR} ] ; then
echo "mkdir -p ${DESTDIR}"
_retry_ mkdir -p ${DESTDIR}
if [ ! -d ${DESTDIR} ] ; then ((ERROR_COUNT++)) ; fi #avoid false positive eos error if the directory was actually created
fi
+echo "====================================================="
+echo "=== Create repodata on local machine"
+echo "====================================================="
+echo "nicos_rpm::::::: createrepo --workers 8 --update ${SOURCEDIR} :::::::" `date`
+createrepo --workers 8 --update ${SOURCEDIR} || ((ERROR_COUNT++))
+
arr_rpm=(`(shopt -s nocaseglob; ls ${SOURCEDIR}/*.rpm)`)
if [ "${#arr_rpm[@]}" -le 0 ]; then
echo "nicos_rpm: Warning: no rpm files are found in ${SOURCEDIR}"
@@ -98,10 +104,11 @@ if [ "${#arr_rpm[@]}" -le 0 ]; then
_retry_ cp -a $ele ${DESTDIR} || ((ERROR_COUNT++))
done
fi
+
echo "====================================================="
-echo "=== Update http RPMs location"
+echo "=== Copy repodata to nightly eos location"
echo "====================================================="
-echo "nicos_rpm::::::: createrepo --workers 8 --update ${DESTDIR} :::::::" `date`
-createrepo --workers 8 --update ${DESTDIR} || ((ERROR_COUNT++))
+echo "Info: copying ${SOURCEDIR}/repodata to ${DESTDIR}"
+_retry_ cp -a -rf ${SOURCEDIR}/repodata ${DESTDIR} || ((ERROR_COUNT++))
exit ${ERROR_COUNT}
--
GitLab