summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-02 15:50:49 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-02 15:50:49 +0200
commitc3406e04c34737e081832b8b27ef54b70d749738 (patch)
tree9d344dde89783dfe57c9ff49407440d384d3d8e8
parentd02bc4b66a674fbd0bc022783d6a383e8849a4b1 (diff)
downloadjenkins.debian.net-c3406e04c34737e081832b8b27ef54b70d749738.tar.xz
drop crappy tests which were trying to make sure triggers are set correctly. much better to create proper job-cfg/*yaml in the first place
-rwxr-xr-xupdate_jdn.sh15
1 files changed, 0 insertions, 15 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index af574fd0..ddee8478 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -282,21 +282,6 @@ explain "Jenkins jobs updated."
rm -f $TMPFILE
#
-# 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 -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)
-#DEFINED_REPRODUCIBLE_TRIGGERS=$(grep "^ defaults: reproducible$" reproducible.yaml|wc -l)
-let DEFINED_TRIGGERS=DEFINED_MY_TRIGGERS+DEFINED_DI_TRIGGERS
-#let DEFINED_TRIGGERS=DEFINED_TRIGGERS+DEFINED_REPRODUCIBLE_TRIGGERS
-let CONFIGURED_TRIGGERS=$(grep \</childProjects /var/lib/jenkins/jobs/*/config.xml|wc -l)+$(grep \<childProjects /var/lib/jenkins/jobs/*/config.xml |grep , |xargs -r echo | sed 's/[^,]//g'| wc -m)-1
-if [ "$DEFINED_TRIGGERS" != "$CONFIGURED_TRIGGERS" ] ; then
- figlet -f banner Warning
- explain "Number of defined triggers ($DEFINED_TRIGGERS) differs from currently configured triggers ($CONFIGURED_TRIGGERS), please investigate."
-fi
-
-#
# configure git for jenkins
#
if [ "$(sudo su - jenkins -c 'git config --get user.email')" != "jenkins@jenkins.debian.net" ] ; then