diff options
| author | Holger Levsen <holger@layer-acht.org> | 2012-12-03 12:43:15 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-03 12:43:15 +0100 |
| commit | 36ed0943166ac4e1ee1cc34c56097f322bcbda21 (patch) | |
| tree | 762ae11a4fd025921434150073642b6712c43d0a | |
| parent | 72dcdeba00e4d5eabb3916ebca1e8974298da8b4 (diff) | |
| download | jenkins.debian.net-36ed0943166ac4e1ee1cc34c56097f322bcbda21.tar.xz | |
count correctly, report more verbose
| -rwxr-xr-x | bin/cd_tester.sh | 5 | ||||
| -rwxr-xr-x | update_jdn.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index 43adeb76..94a1409a 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -49,6 +49,8 @@ RESULTS=$WORKSPACE/results cleanup_all() { set -x cd $RESULTS + echo -n "Last screenshot: " + ls -t1 *.ppm | head -1 # # create video # @@ -93,7 +95,8 @@ bootstrap() { monitor_installation() { cd $RESULTS sleep 4 - echo "Taking screenshots every 2secs now, until the installation is finished or 5h have passed" + echo "Taking screenshots every 2 secondss now, until the installation is finished (or qemu ends for other reasons) or 5h have passed or if the installation seems to hang." + echo NR=0 while [ $NR -lt 9000 ] ; do set +x 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." |