From 7e0d0427c9b07407cd286851de070a91bfd4cec0 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Thu, 17 Dec 2015 14:37:50 +0000
Subject: [PATCH] Switch to new propagation scanning

Signed-off-by: Adrian Reber <adrian@lisas.de>
---
 .../crawler/files/check_propagation.sh        | 28 +++++++++++++++++++
 roles/mirrormanager/crawler/tasks/main.yml    | 28 ++++++++-----------
 2 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100755 roles/mirrormanager/crawler/files/check_propagation.sh

diff --git a/roles/mirrormanager/crawler/files/check_propagation.sh b/roles/mirrormanager/crawler/files/check_propagation.sh
new file mode 100755
index 0000000000..19aa2a94bb
--- /dev/null
+++ b/roles/mirrormanager/crawler/files/check_propagation.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+URL="https://admin.fedoraproject.org/pkgdb/api/collections/f*/?clt_status=Active"
+CRAWLER="/usr/bin/mm2_crawler"
+LOGBASE="/var/log/mirrormanager/propagation"
+
+
+ACTIVE=`mktemp`
+
+trap "rm -f ${ACTIVE}" QUIT TERM INT HUP EXIT
+
+curl -s ${URL} >> ${ACTIVE}
+
+if [ $? -ne 0 ]; then
+	echo "PROPAGATION: Querying the active collections failed. Exiting!"
+	exit 1
+fi
+
+# check propagation for the active branches
+for version in `jq -r ".collections[$i].version" < ${ACTIVE}`; do
+	${CRAWLER} --propagation --proppath updates/${version}/x86_64/repodata --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/f${version}_updates-propagation.log.$( date +%s )
+done
+
+# check propagation for the development branch
+${CRAWLER} --propagation --threads 50 2>&1 | grep SHA256 > ${LOGBASE}/development-propagation.log.$( date +%s )
+
+# clean up log files older than 14 days
+/usr/sbin/tmpwatch --mtime 14d ${LOGBASE}
diff --git a/roles/mirrormanager/crawler/tasks/main.yml b/roles/mirrormanager/crawler/tasks/main.yml
index 43b4dbbb08..1b2822af29 100644
--- a/roles/mirrormanager/crawler/tasks/main.yml
+++ b/roles/mirrormanager/crawler/tasks/main.yml
@@ -13,6 +13,7 @@
   - python-psycopg2
   - fedmsg
   - python-GeoIP
+  - jq
   tags:
   - packages
 
@@ -36,25 +37,20 @@
   - config
   when: env != 'staging'
 
-- name: install the script to distribute the mirrors to crawl
-  copy: src=mm2_get-mirrors-to-crawl dest=/usr/local/bin/mm2_get-mirrors-to-crawl mode=0755
-
-- name: install the crawler distribute script
-  copy: src=run_crawler.sh dest=/usr/local/bin/run_crawler.sh mode=0755
+- name: install crawling helper scripts
+  copy: src={{ item }} dest=/usr/local/bin/{{ item }} mode=0755
+  with_items:
+  - mm2_get-mirrors-to-crawl
+  - run_crawler.sh
+  - check_propagation.sh
 
 # Directory used to store the result of the repomd.xml propagation test
 - name: create /var/log/mirrormanager/propagation
   file: path=/var/log/mirrormanager/propagation state=directory
           owner=mirrormanager group=mirrormanager mode=0755
 
-- name: propagation cronjob rawhide
-  cron: name="propagation-rawhide" minute="45" hour="*/2" user="mirrormanager"
-        job="/usr/bin/mm2_crawler --propagation --threads 50 2>&1 | grep SHA256 > /var/log/mirrormanager/propagation/propagation.log.$( date +\%s )"
-        cron_file=propagation-rawhide
-  when: inventory_hostname.startswith('mm-crawler01')
-
-- name: propagation cronjob f22-updates
-  cron: name="propagation-f22-updates" minute="15" hour="*/2" user="mirrormanager"
-        job="/usr/bin/mm2_crawler --propagation --threads 50 --proppath updates/22/x86_64/repodata 2>&1 | grep SHA256 > /var/log/mirrormanager/propagation/f22-updates-propagation.log.$( date +\%s )"
-        cron_file=propagation-f22-updates
-  when: inventory_hostname.startswith('mm-crawler01')
+- name: propagation cronjob
+  cron: name="propagation-check" minute="15,45" hour="*" user="mirrormanager"
+        job="/usr/local/bin/check_propagation.sh"
+        cron_file=propagation-check
+  when: inventory_hostname.startswith('mm-crawler01.phx2')