summaryrefslogtreecommitdiffstats
path: root/update_jdn.sh
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-12-03 12:43:15 +0100
committerHolger Levsen <holger@layer-acht.org>2012-12-03 12:43:15 +0100
commit36ed0943166ac4e1ee1cc34c56097f322bcbda21 (patch)
tree762ae11a4fd025921434150073642b6712c43d0a /update_jdn.sh
parent72dcdeba00e4d5eabb3916ebca1e8974298da8b4 (diff)
downloadjenkins.debian.net-36ed0943166ac4e1ee1cc34c56097f322bcbda21.tar.xz
count correctly, report more verbose
Diffstat (limited to 'update_jdn.sh')
-rwxr-xr-xupdate_jdn.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index 7256a586..2a310fd8 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -84,8 +84,8 @@ explain "Jenkins jobs updated."
#
DEFINED_CHROOT_TRIGGERS=$(grep _trigger: chroot-tests.yaml|wc -l)
DEFINED_DI_TRIGGERS=$(grep "defaults: d-i-manual-html" d-i.yaml|wc -l)
-let DEFINED_TRIGGERS=DEFINED_CHROOT_TRIGGERS+DEFINED_DI_TRIGGERS
-CONFIGURED_TRIGGERS=$(grep -C 1 \<hudson.tasks.BuildTrigger /var/lib/jenkins/jobs/*/config.xml|grep child|wc -l)
+let DEFINED_TRIGGERS=DEFINED_CHROOT_TRIGGERS+DEFINED_DI_TRIGGERS+1 # add 1 as "wc -m" also counts one extra...
+let CONFIGURED_TRIGGERS=$(grep \<childProjects /var/lib/jenkins/jobs/*/config.xml|wc -l)+$(grep \<childProjects /var/lib/jenkins/jobs/*/config.xml |grep , |xargs echo | sed 's/[^,]//g'| wc -m)
if [ "$DEFINED_TRIGGERS" != "$CONFIGURED_TRIGGERS" ] ; then
figlet Warning
explain "Number of defined triggers ($DEFINED_TRIGGERS) differs from currently configured triggers ($CONFIGURED_TRIGGERS), please investigate."