summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2012-11-08 10:08:29 +0100
committerHolger Levsen <holger@layer-acht.org>2012-11-08 10:08:29 +0100
commite567d070ffac45ba3269e41268e5ba099bf687bc (patch)
treedc23f9c78f118ebdb1e70449f5e7c1b5847fadd7
parentb945c515b36a6320d0a77ec7304342cdc01f03c1 (diff)
downloadjenkins.debian.net-e567d070ffac45ba3269e41268e5ba099bf687bc.tar.xz
add tests to check if triggers are configured correctly
-rw-r--r--job-cfg/chroot-test.yaml9
-rw-r--r--job-cfg/d-i.yaml14
-rwxr-xr-xupdate_jdn.sh10
3 files changed, 29 insertions, 4 deletions
diff --git a/job-cfg/chroot-test.yaml b/job-cfg/chroot-test.yaml
index cbbf3fdf..20193eb9 100644
--- a/job-cfg/chroot-test.yaml
+++ b/job-cfg/chroot-test.yaml
@@ -101,11 +101,11 @@
unstable_on_warning: 'true'
fail_on_error: 'true'
- trigger:
- project: 'chroot-test-sid_bootstrap'
+ project: '{my_1st_trigger}'
- trigger:
- project: 'chroot-test-wheezy_bootstrap'
+ project: '{my_2nd_trigger}'
- trigger:
- project: 'chroot-test-squeeze_bootstrap_upgrade_to_wheezy'
+ project: '{my_3rd_trigger}'
- job-template:
defaults: chroot-tests
@@ -219,4 +219,7 @@
- '{name}-housekeeping':
my_description: 'Cleanup so that there is a predictable environment.'
+ my_1st_trigger: 'chroot-test-sid_bootstrap'
+ my_2nd_trigger: 'chroot-test-wheezy_bootstrap'
+ my_3rd_trigger: 'chroot-test-squeeze_bootstrap_upgrade_to_wheezy'
diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml
index 79cd3827..6be2f8c5 100644
--- a/job-cfg/d-i.yaml
+++ b/job-cfg/d-i.yaml
@@ -35,7 +35,19 @@
rulespath: '/srv/jenkins/logparse/debian.rules'
unstable_on_warning: 'true'
fail_on_error: 'true'
- # FIXME missing publisher: build-logs.html "daily d-i build logs"
+# FIXME:
+# <htmlpublisher.HtmlPublisher>
+# <reportTargets>
+# <htmlpublisher.HtmlPublisherTarget>
+# <reportName>daily d-i build logs</reportName>
+# <reportDir>.</reportDir>
+# <reportFiles>build-logs.html</reportFiles>
+# <keepAll>true</keepAll>
+# <wrapperName>htmlpublisher-wrapper.html</wrapperName>
+# </htmlpublisher.HtmlPublisherTarget>
+# </reportTargets>
+# </htmlpublisher.HtmlPublisher>
+
- project:
name: d-i
diff --git a/update_jdn.sh b/update_jdn.sh
index 99e59cc0..cd1dd91b 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -65,3 +65,13 @@ cd /srv/jenkins/job-cfg
sudo jenkins-jobs update .
explain "Jenkins jobs updated."
+#
+# crappy tests for checking that jenkins-job-builder works correctly
+#
+DEFINED_TRIGGERS=$(grep -c _trigger: job-cfg/*)
+CONFIGURED_TRIGGERS=$(grep -C 1 \<hudson.tasks.BuildTrigger /var/lib/jenkins/jobs/*/config.xml|grep child|wc)
+if [ $DEFINED_TRIGGERS -ne $CONFIGURED_TRIGGERS ] ; then
+ figlet Warning
+ echo "Number of defined triggers ($DEFINED_TRIGGERS) differs from configured triggers ($CONFIGURED_TRIGGERS), please investigate."
+fi
+