From 15e90ebc5df0346e95137ecc91c31d5d4195d6cf Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Sun, 4 Nov 2012 21:41:50 +0100 Subject: some more TODO. add job-type prefix to chroot-path --- TODO | 4 ++-- bin/chroot_tester.sh | 2 +- bin/housekeeping.sh | 5 +++-- update_jdn.sh | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index f9630dfa..26899a78 100644 --- a/TODO +++ b/TODO @@ -24,7 +24,6 @@ About jenkins.debian.net ** svn:scm * mail notifications (to where?) * proper backup (=daily), see bottom of this document for what to backup -* more tests (see below) === More minor stuff @@ -65,13 +64,14 @@ About jenkins.debian.net * build the manual on every svn commit ** later: notify debian-boot@l.d.o and #debian-boot * run scripts/digress/ -* bubulle wrote: "Another interesting target would be d-i builds *including non uploaded > packages* (something like "d-i from git repositories" images). That would in some way require to create a quite specific image, with all udebs (while netboot only has udebs needed before one gets a working network setup). +* bubulle wrote: "Another interesting target would be d-i builds *including non uploaded packages* (something like "d-i from git repositories" images). That would in some way require to create a quite specific image, with all udebs (while netboot only has udebs needed before one gets a working network setup). === Tests using autopkgtest * I aware but also lost, after looking at /usr/share/doc/autopkgtest/ - wanna help? * https://wiki.ubuntu.com/AutomatedTesting has more information, but help is still welcome to implement this. * finding packages with autopkgtests: http://lists.debian.org/debian-qa/2012/11/msg00012.html +** this only lists a few packages, so a very first test could be to compare this list against this: `wget -q http://http.debian.net/debian/dists/unstable/main/Contents-source.gz -O- | zgrep -m1 -E '^debian/tests/control\s'`, make a job out of it and make it UNSTABLE if the diff is non-zero. And as a second step, run those tests... * also see http://dep.debian.net/deps/dep8/ == Installed software that makes jenkins.debian.net run diff --git a/bin/chroot_tester.sh b/bin/chroot_tester.sh index dae4cacc..ab64c083 100755 --- a/bin/chroot_tester.sh +++ b/bin/chroot_tester.sh @@ -32,7 +32,7 @@ export DEBIAN_FRONTEND=noninteractive export LANG=C export http_proxy=$http_proxy" -export CHROOT_TARGET=$(mktemp -d -p /chroots/ $1.XXXXXXXXX) +export CHROOT_TARGET=$(mktemp -d -p /chroots/ chroot-tests-$1.XXXXXXXXX) export TMPFILE=$(mktemp -u) export CTMPFILE=$CHROOT_TARGET/$TMPFILE diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh index 5236b5dc..eb0ced7e 100755 --- a/bin/housekeeping.sh +++ b/bin/housekeeping.sh @@ -15,14 +15,15 @@ echo vnstat echo -HOUSE=$(ls /chroots/) +CHROOT_PATTERN="/chroots/chroot-tests-*" +HOUSE=$(ls $CHROOT_PATTERN) if [ "$HOUSE" != "" ] ; then figlet "Warning:" echo echo "Probably manual cleanup needed:" echo echo "$ ls -la /chroots/" - ls -la /chroots/ + echo $HOUSE exit 1 fi diff --git a/update_jdn.sh b/update_jdn.sh index 039193d6..27f14103 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -16,7 +16,7 @@ done # cp -r bin logparse job-cfg /srv/jenkins/ cp -r userContent/* /var/lib/jenkins/userContent/ -asciidoc -a numbered -a data-uri -a iconsdir=/etc/asciidoc/images/icons -a scriptsdir=/etc/asciidoc/javascripts -a imagesdir=./ -b html5 -a toc -a toclevels=4 -a icons -o about.html TODO && cp about.html /var/lib/jenkins/userContent/ +asciidoc -a numbered -a data-uri -a iconsdir=/etc/asciidoc/images/icons -a scriptsdir=/etc/asciidoc/javascripts -a imagesdir=./ -b html5 -a toc -a toclevels=4 -a icons -o about.html TODO && cp about.html /var/lib/jenkins/userContent/ && echo Updated about.html # # install packages we need @@ -41,7 +41,7 @@ fi sudo chown root.root /etc/sudoers.d/jenkins ; sudo chmod 700 /etc/sudoers.d/jenkins sudo ln -sf /etc/apache2/sites-available/jenkins.debian.net /etc/apache2/sites-enabled/000-default sudo service apache2 reload -cd /etc/munin/plugins ; sudo rm rm postfix_* open_inodes df_inode interrupts diskstats +cd /etc/munin/plugins ; sudo rm -f postfix_* open_inodes df_inode interrupts diskstats 2>/dev/null # # run jenkins-job-builder to update jobs if needed -- cgit v1.2.3-70-g09d2