diff options
-rwxr-xr-x | bin/cd_tester.sh | 14 | ||||
-rw-r--r-- | job-cfg/cd-test.yaml | 11 |
2 files changed, 16 insertions, 9 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index d758fa65..db61ede8 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -5,13 +5,15 @@ # $1 = vnc-display, each job should have a unique one, so jobs can run in parallel # $2 = name -# $3 = wget url/jigdo url +# $3 = disksize in GB +# $4 = wget url/jigdo url -if [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ] ; then +if [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ] || [ "$4" = "" ] ; then echo "need three params" echo '# $1 = vnc-display, each job should have a unique one, so jobs can run in parallel' echo '# $2 = name' - echo '# $3 = wget url/jigdo url' + echo '# $3 = disksize in GB' + echo '# $4 = wget url/jigdo url' exit 1 fi @@ -29,7 +31,8 @@ export http_proxy="http://localhost:3128" # DISPLAY=$1 NAME=$2 -URL=$3 +DISKSIZE_IN_GB=$3 +URL=$4 if [ "$(basename $URL)" != "amd64" ] ; then IMAGE=$(pwd)/$(basename $URL) IMAGE_MNT="/media/cd-$NAME.iso" @@ -72,8 +75,9 @@ cleanup_all() { bootstrap() { cd $WORKSPACE + echo "Creating qcow disk image with ${DISKSIZE_IN_GB}g now." + qemu-img create -f qcow $NAME.qcow ${DISKSIZE_IN_GB}g echo "Doing cd tests for $NAME now." - qemu-img create -f qcow $NAME.qcow 20g case $NAME in wheezy-debian-edu-workstation) # FIXME: this obviously needs to be moved to a function diff --git a/job-cfg/cd-test.yaml b/job-cfg/cd-test.yaml index 2718b235..ff6e180c 100644 --- a/job-cfg/cd-test.yaml +++ b/job-cfg/cd-test.yaml @@ -17,7 +17,7 @@ unstable_on_warning: 'true' fail_on_error: 'true' - email: - recipients: holger@layer-acht.org + recipients: '{my_recipients}' - archive: artifacts: 'results/*.*' latest_only: false @@ -52,15 +52,18 @@ do_not_edit: '<br><br>Configured by <a href="http://jenkins.debian.net/userContent/about.html">jenkins-job-builder</a>, do not edit this job through the web UI.' jobs: - '{name}_wheezy_debian_edu_workstation': - my_shell: '/srv/jenkins/bin/cd_tester.sh 1 wheezy-debian-edu-workstation http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso' + my_shell: '/srv/jenkins/bin/cd_tester.sh 1 wheezy-debian-edu-workstation 25 http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso' my_description: 'Do a fully automated installation of a Debian Edu Wheezy workstation installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/wheezy-debian-edu-workstation-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.' my_timed: '42 23 * * *' + my_recipients: 'jenkins+debian-edu holger@layer-acht.org' - '{name}_squeeze-test_debian_edu_standalone': - my_shell: '/srv/jenkins/bin/cd_tester.sh 2 squeeze-test-debian-edu-standalone http://ftp.skolelinux.org/cd-squeeze-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso' + my_shell: '/srv/jenkins/bin/cd_tester.sh 2 squeeze-test-debian-edu-standalone 20 http://ftp.skolelinux.org/cd-squeeze-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso' my_description: 'Do a fully automated installation of a Debian Edu Squeeze (suite: squeeze-test) standalone installation - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/squeeze-test-debian-edu-standalone-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.' my_timed: '42 3 * * *' + my_recipients: 'jenkins+debian-edu holger@layer-acht.org' - '{name}_wheezy_lxde': - my_shell: '/srv/jenkins/bin/cd_tester.sh 3 wheezy-lxde http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' + my_shell: '/srv/jenkins/bin/cd_tester.sh 3 wheezy-lxde 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/' my_description: 'Do a fully automated installation of Debian installing the LXDE desktop - via d-i preseeding (with <a href="http://jenkins.debian.net/userContent/wheezy-lxde-preseed.cfg">this preseed.cfg</a>) using netboot gtk.' my_timed: '42 17 * * *' + my_recipients: 'jenkins+debian-boot holger@layer-acht.org' |