summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/cd_tester.sh5
-rwxr-xr-xupdate_jdn.sh4
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."