diff options
| -rwxr-xr-x | bin/cd_tester.sh | 25 | ||||
| -rw-r--r-- | job-cfg/cd-test.yaml | 24 | ||||
| -rw-r--r-- | userContent/squeeze-test-debian-edu-standalone-preseed.cfg (renamed from userContent/debian-edu-squeeze-test-standalone-preseed.cfg) | 0 | ||||
| -rw-r--r-- | userContent/wheezy-debian-edu-workstation-preseed.cfg (renamed from userContent/debian-edu-wheezy-workstation-preseed.cfg) | 0 | ||||
| -rw-r--r-- | userContent/wheezy-lxde-preseed.cfg (renamed from userContent/lxde-wheezy-preseed.cfg) | 0 |
5 files changed, 31 insertions, 18 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index aedfbb94..c489ad0c 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -75,16 +75,29 @@ bootstrap() { echo "Doing cd tests for $NAME now." qemu-img create -f qcow $NAME.qcow 20g case $NAME in - debian-edu-wheezy) - echo "fire up qemu now..." + wheezy-debian-edu-workstation) + # FIXME: this obviously needs to be moved to a function + echo "Preseeding used:" + echo + curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" + echo + echo "Starting QEMU now:" sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; - debian-edu-squeeze-test-standalone) - echo "fire up qemu now..." + squeeze-test-debian-edu-standalone) + echo "Preseeding used:" + echo + curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" + echo + echo "Starting QEMU now:" sudo qemu-system-x86_64 -cdrom $IMAGE -hda $NAME.qcow -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; - lxde-wheezy) - echo "fire up qemu now..." + wheezy-lxde) + echo "Preseeding used:" + echo + curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" + echo + echo "Starting QEMU now:" sudo qemu-system-x86_64 -hda $NAME.qcow -boot c -m 1024 -display vnc=localhost:$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD & ;; *) echo "unsupported distro." diff --git a/job-cfg/cd-test.yaml b/job-cfg/cd-test.yaml index 3c805a3c..2718b235 100644 --- a/job-cfg/cd-test.yaml +++ b/job-cfg/cd-test.yaml @@ -37,30 +37,30 @@ - job-template: defaults: cd-test - name: '{name}_debian_edu_workstation_wheezy' + name: '{name}_wheezy_debian_edu_workstation' - job-template: defaults: cd-test - name: '{name}_debian_edu_standalone_squeeze_test' + name: '{name}_squeeze-test_debian_edu_standalone' - job-template: defaults: cd-test - name: '{name}_lxde_wheezy' + name: '{name}_wheezy_lxde' - project: name: cd-test 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}_debian_edu_workstation_wheezy': - my_shell: '/srv/jenkins/bin/cd_tester.sh 1 debian-edu-wheezy 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/debian-edu-workstation-wheezy-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.' + - '{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_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 * * *' - - '{name}_debian_edu_standalone_squeeze_test': - my_shell: '/srv/jenkins/bin/cd_tester.sh 2 debian-edu-squeeze-test-standalone 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/debian-edu-standalone-squeeze-test-preseed.cfg">this preseed.cfg</a>) using the netinst CD image.' + - '{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_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 * * *' - - '{name}_lxde_wheezy': - my_shell: '/srv/jenkins/bin/cd_tester.sh 3 lxde-wheezy 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/lxde-wheezy-preseed.cfg">this preseed.cfg</a>) using netboot gtk.' + - '{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_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 * * *' diff --git a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg b/userContent/squeeze-test-debian-edu-standalone-preseed.cfg index 3470c0f4..3470c0f4 100644 --- a/userContent/debian-edu-squeeze-test-standalone-preseed.cfg +++ b/userContent/squeeze-test-debian-edu-standalone-preseed.cfg diff --git a/userContent/debian-edu-wheezy-workstation-preseed.cfg b/userContent/wheezy-debian-edu-workstation-preseed.cfg index f20561ae..f20561ae 100644 --- a/userContent/debian-edu-wheezy-workstation-preseed.cfg +++ b/userContent/wheezy-debian-edu-workstation-preseed.cfg diff --git a/userContent/lxde-wheezy-preseed.cfg b/userContent/wheezy-lxde-preseed.cfg index 1b97f968..1b97f968 100644 --- a/userContent/lxde-wheezy-preseed.cfg +++ b/userContent/wheezy-lxde-preseed.cfg |