From 0025435b1c8b4e2e3d0f10b73741a167b33c5cd2 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 28 Jan 2022 17:09:37 +0100 Subject: [PATCH] Add epel to MM propagation scans Signed-off-by: Adrian Reber --- .../backend/templates/handle_propagation.sh | 6 ++++++ .../crawler/files/check_propagation.sh | 21 +++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/roles/mirrormanager/backend/templates/handle_propagation.sh b/roles/mirrormanager/backend/templates/handle_propagation.sh index efb2675f87..fd39c59a55 100644 --- a/roles/mirrormanager/backend/templates/handle_propagation.sh +++ b/roles/mirrormanager/backend/templates/handle_propagation.sh @@ -27,6 +27,12 @@ done ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/development*" +# EPEL +for version in 7 8 9; do + ${PROPAGATION} --outdir ${OUTPUT} --logfiles "${LOGBASE}/epel${version}*" --prefix epel${version} +done + for f in ${FRONTENDS}; do rsync -aq ${OUTPUT}/*[st]-repomd-propagation.svg ${f}:/var/www/mirrormanager-statistics/data/propagation + rsync -aq ${OUTPUT}/epel[789]-repomd-propagation.svg ${f}:/var/www/mirrormanager-statistics/data/propagation done diff --git a/roles/mirrormanager/crawler/files/check_propagation.sh b/roles/mirrormanager/crawler/files/check_propagation.sh index 5e6022c4ce..d74319a874 100755 --- a/roles/mirrormanager/crawler/files/check_propagation.sh +++ b/roles/mirrormanager/crawler/files/check_propagation.sh @@ -18,15 +18,24 @@ fi # check propagation for the active branches for version in `jq -r ".results[$i].version" < ${ACTIVE} | grep -v Rawhide`; do - if [[ ${version} -lt 28 ]]; then - ${CRAWLER} --propagation --proppath updates/${version}/x86_64/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/f${version}_updates-propagation.log.$( date +%s ) - else - ${CRAWLER} --propagation --proppath updates/${version}/Everything/x86_64/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/f${version}_updates-propagation.log.$( date +%s ) - fi + if [[ ${version} -lt 28 ]]; then + ${CRAWLER} --category "Fedora Linux" --propagation --proppath updates/${version}/x86_64/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/f${version}_updates-propagation.log.$( date +%s ) + else + ${CRAWLER} --category "Fedora Linux" --propagation --proppath updates/${version}/Everything/x86_64/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/f${version}_updates-propagation.log.$( date +%s ) + fi done # check propagation for the development branch -${CRAWLER} --propagation --proppath development/rawhide/Everything/x86_64/os/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/development-propagation.log.$( date +%s ) +${CRAWLER} --category "Fedora Linux" --propagation --proppath development/rawhide/Everything/x86_64/os/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/development-propagation.log.$( date +%s ) + +# check propagation for EPEL +for version in 7 8 9; do + if [[ ${version} -lt 8 ]]; then + ${CRAWLER} --category "Fedora EPEL" --propagation --proppath ${version}/x86_64/repodata --threads 50 --timeout 1 2>&1 | grep SHA256 > ${LOGBASE}/epel${version}-propagation.log.$( date +%s ) + else + ${CRAWLER} --category "Fedora EPEL" --propagation --proppath ${version}/Everything/x86_64/repodata --threads 50 --timeout 1 2>&1 | grep SHA256 > ${LOGBASE}/epel${version}-propagation.log.$( date +%s ) + fi +done # clean up log files older than 14 days /usr/sbin/tmpwatch --mtime 14d ${LOGBASE}