[Qa-jenkins-scm] [jenkins.debian.net] 01/01: g-i edu: s#main+ltsp#combi# -server

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 74f52bf0c862748e7c25610f23fb1d8dda8aa489
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 14 15:50:40 2016 +0200

    g-i edu: s#main+ltsp#combi# -server
---
 ...eed.cfg => debian-edu_jessie-daily-netinst_combi-server_preseed.cfg} | 0
 d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg   | 1 +
 .../debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg            | 1 -
 .../debian-edu_jessie-final-netinst_combi-server_preseed.cfg            | 1 +
 .../debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg        | 1 -
 d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg   | 1 +
 .../debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg            | 1 -
 .../debian-edu_stretch-daily-netinst_combi-server_preseed.cfg           | 1 +
 .../debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg             | 1 -
 job-cfg/g-i-installation.yaml                                           | 2 +-
 10 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
similarity index 100%
rename from d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
rename to d-i-preseed-cfgs/debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg
new file mode 120000
index 0000000..e145a11
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de1..0000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-daily-usb_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg
new file mode 120000
index 0000000..e145a11
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de1..0000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-final-netinst_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg
new file mode 120000
index 0000000..e145a11
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de1..0000000
--- a/d-i-preseed-cfgs/debian-edu_jessie-final-usb_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg
new file mode 120000
index 0000000..e145a11
--- /dev/null
+++ b/d-i-preseed-cfgs/debian-edu_stretch-daily-netinst_combi-server_preseed.cfg
@@ -0,0 +1 @@
+debian-edu_jessie-daily-netinst_combi-server_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg
deleted file mode 120000
index fac1de1..0000000
--- a/d-i-preseed-cfgs/debian-edu_stretch-netinst_main+ltsp-server_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu_jessie-daily-netinst_main+ltsp-server_preseed.cfg
\ No newline at end of file
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index fb302ca..a6bac5c 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -322,7 +322,7 @@
                                   my_title_extra: ' (Default)' }
             - standalone_mate:  { my_time: '23 2 4,18 * *', my_disksize: 25 }
             - main-server:      { my_time: '23 3 4,18 * *',   my_disksize: 40 }
-            - main+ltsp-server: { my_time: '42 0 4,18 * *',   my_disksize: 60 }
+            - combi-server: { my_time: '42 0 4,18 * *',   my_disksize: 60 }
 
       - '{name}_debian_{my_ver}_presentation':
           my_ver:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git