5 files changed, 16 insertions, 16 deletions
diff --git a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main-ltsp-server_preseed.cfg
index 98d853a8..98d853a8 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main-ltsp-server_preseed.cfg
diff --git a/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main-server_preseed.cfg
index 40098fb5..40098fb5 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main-server_preseed.cfg
diff --git a/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_mate_preseed.cfg
index ded1447f..ded1447f 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_mate_preseed.cfg
diff --git a/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg
index ded1447f..ded1447f 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 42b60f58..812b5f31 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -303,19 +303,19 @@
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_debian-edu_jessie-current-netinst_standalone'
+    name: '{name}_debian-edu_jessie-daily-netinst_standalone'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_debian-edu_jessie-current-netinst_standalone_mate'
+    name: '{name}_debian-edu_jessie-daily-netinst_standalone_mate'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_debian-edu_jessie-current-netinst_main-server'
+    name: '{name}_debian-edu_jessie-daily-netinst_main-server'
 
 - job-template:
     defaults: g-i-installation
-    name: '{name}_debian-edu_jessie-current-netinst_main-ltsp-server'
+    name: '{name}_debian-edu_jessie-daily-netinst_main-ltsp-server'
 
 - project:
     name: g-i-installation
@@ -681,31 +681,31 @@
          my_time: '42 2 * * 1'
          my_trigger: ''
          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
-      - '{name}_debian-edu_jessie-current-netinst_standalone':
-         my_title: 'Debian Edu (jessie) standalone (Default)'
+      - '{name}_debian-edu_jessie-daily-netinst_standalone':
+         my_title: 'Debian Edu (jessie daily netinst) standalone (Default)'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-jessie-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Jessie standalone profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Jessie standalone profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_preseed.cfg">this preseed.cfg</a>) using the daily netinst image.'
          my_time: '42 1 */2 * *'
          my_trigger: ''
          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
-      - '{name}_debian-edu_jessie-current-netinst_standalone_mate':
-         my_title: 'Debian Edu (jessie) standalone (Mate Desktop)'
+      - '{name}_debian-edu_jessie-daily-netinst_standalone_mate':
+         my_title: 'Debian Edu (jessie daily netinst) standalone (Mate Desktop)'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-jessie-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Jessie standalone profile with Mate desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie_standalone_mate_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Jessie standalone profile with Mate desktop - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_standalone_mate_preseed.cfg">this preseed.cfg</a>) using the daily netinst image.'
          my_time: '42 1 */2 * *'
          my_trigger: ''
          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
-      - '{name}_debian-edu_jessie-current-netinst_main-server':
-         my_title: 'Debian Edu (jessie) main-server'
+      - '{name}_debian-edu_jessie-daily-netinst_main-server':
+         my_title: 'Debian Edu (jessie daily netinst) main-server'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 http://ftp.skolelinux.org/cd-jessie-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Jessie main-server profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie_main-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Jessie main-server profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main-server_preseed.cfg">this preseed.cfg</a>) using the daily netinst image.'
          my_time: '42 3 * * *'
          my_trigger: ''
          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
-      - '{name}_debian-edu_jessie-current-netinst_main-ltsp-server':
-         my_title: 'Debian Edu (jessie) main+ltsp-server'
+      - '{name}_debian-edu_jessie-daily-netinst_main-ltsp-server':
+         my_title: 'Debian Edu (jessie daily netinst) main+ltsp-server'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 40 http://ftp.skolelinux.org/cd-jessie-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
-         my_description: 'Do a fully automated installation of a Debian Edu Jessie main+ltsp-server profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie_main+ltsp-server_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
+         my_description: 'Do a fully automated installation of a Debian Edu Jessie main+ltsp-server profile - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg">this preseed.cfg</a>) using the daily netinst image.'
          my_time: '42 0 * * *'
          my_trigger: ''
          my_recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'