summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-02-21 14:09:36 +0100
committerHolger Levsen <holger@layer-acht.org>2015-02-21 14:09:36 +0100
commit7e1e81a0392787843ea6365a1426bd7dec6133ec (patch)
tree76f014209540afaa4d8fb102935bd54736c916aa
parent2f9f338aa0ae02b2a28e7177ee8d3ddc59526c84 (diff)
downloadjenkins.debian.net-7e1e81a0392787843ea6365a1426bd7dec6133ec.tar.xz
calculate triggers: ignore commented triggers....
-rwxr-xr-xupdate_jdn.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index eb8658f1..9b38c96f 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -231,7 +231,7 @@ explain "Jenkins jobs updated."
# crappy tests for checking that jenkins-job-builder works correctly
#
#wc -m counts one byte too many, so we substract one
-let DEFINED_MY_TRIGGERS=$(grep my_trigger: *.yaml|grep -v "my_trigger: ''"|wc -l)+$(grep my_trigger: *.yaml|grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1
+let DEFINED_MY_TRIGGERS=$(grep -v \# *.yaml | grep my_trigger: | grep -v "my_trigger: ''"|wc -l)+$(grep my_trigger: *.yaml|grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1
let DEFINED_DI_TRIGGERS=$(grep "defaults: d-i-manual-html" d-i.yaml|wc -l)-5 # 5 need to be substracted because 5 d-i_manual_pdf jobs dont exist, yet their html pendants trigger them...
#DEFINED_REPRODUCIBLE_TRIGGERS=$(grep "^ defaults: reproducible$" reproducible.yaml|wc -l)
let DEFINED_TRIGGERS=DEFINED_MY_TRIGGERS+DEFINED_DI_TRIGGERS