rename cd-test to g-i-installation

4 files changed, 17 insertions, 15 deletions

diff --git a/README b/README
index 5955b74c..7320321c 100644
--- a/README
+++ b/README
@@ -26,9 +26,11 @@ I love to get feedback on this! Please join #debian-qa on irc.debian.org to repo
 
 Remember, this is still pretty much work in progress. If you can think of ways to improve the usefulness of certain jobs, please do give feedback!
 
-=== cd-tests jobs
+=== g-i-installation jobs
 
-FIXME: cd-tests should really get renamed to d-i-installation
+Installation tests with g-i, the graphical version of d-i, the debian-installer.
+
+FIXME: Describe g-i-installation jobs here
 
 === chroot-tests jobs
 
diff --git a/TODO b/TODO
index 2aeed254..ab31873b 100644
--- a/TODO
+++ b/TODO
@@ -65,7 +65,7 @@ See link:http://jenkins.debian.net/userContent/about.html["about jenkins.debian.
 
 * inform debian-www@
 
-=== cd-test_*:
+=== g-i-installation_*:
 
 * $name-preseed.base -> sed .cfg (LANG)
 ** pick LANG from predefined list at random
diff --git a/bin/cd_tester.sh b/bin/g-i-installation.sh
index b9a15cd6..1abcee6c 100755
--- a/bin/cd_tester.sh
+++ b/bin/g-i-installation.sh
@@ -70,7 +70,7 @@ cleanup_all() {
 	#
 	# create video
 	#
-	ffmpeg2theora --videobitrate 700 --no-upscaling snapshot_%06d.ppm --framerate 12 --max_size 800x600 -o cd-test-$NAME.ogv
+	ffmpeg2theora --videobitrate 700 --no-upscaling snapshot_%06d.ppm --framerate 12 --max_size 800x600 -o g-i-installation-$NAME.ogv
 	rm snapshot_??????.ppm
 	# rename .bak files back to .ppm
 	for i in *.ppm.bak ; do
diff --git a/job-cfg/cd-test.yaml b/job-cfg/g-i-installation.yaml
index 25699c00..3e9b7074 100644
--- a/job-cfg/cd-test.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -1,6 +1,6 @@
 
 - defaults:
-    name: cd-test
+    name: g-i-installation
     description: '{my_description}{do_not_edit}'
     logrotate:
       daysToKeep: 90
@@ -27,8 +27,8 @@
           text: About jenkins.debian.net
           icon: /userContent/images/debian-swirl-24x24.png
       - sidebar:
-          url: http://jenkins.debian.net/view/cd-tests/
-          text: All cd-test jobs
+          url: http://jenkins.debian.net/view/g-i-installation/
+          text: All g-i-installation jobs
           icon: /userContent/images/debian-jenkins-24x24.png
       - sidebar:
           url: http://www.profitbricks.com
@@ -36,33 +36,33 @@
           icon: /userContent/images/profitbricks-24x24.png
 
 - job-template:
-    defaults: cd-test
+    defaults: g-i-installation
     name: '{name}_wheezy_debian_edu_workstation'
 
 - job-template:
-    defaults: cd-test
+    defaults: g-i-installation
     name: '{name}_squeeze-test_debian_edu_standalone'
 
 - job-template:
-    defaults: cd-test
+    defaults: g-i-installation
     name: '{name}_wheezy_lxde'
 
 - project:
-    name: cd-test
-    do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/cd-test.yaml">cd-test.yaml</a>.'
+    name: g-i-installation
+    do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
     jobs:
       - '{name}_wheezy_debian_edu_workstation':
-         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_shell: '/srv/jenkins/bin/g-i-installation.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 20 http://ftp.skolelinux.org/cd-squeeze-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
+         my_shell: '/srv/jenkins/bin/g-i-installation.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 10 http://d-i.debian.org/daily-images/amd64/daily/netboot/gtk/debian-installer/amd64/'
+         my_shell: '/srv/jenkins/bin/g-i-installation.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: 'holger@layer-acht.org'  # FIXME readd jenkins+debian-boot once we made this more stable