ubuntu-server-iso-testing-dev team mailing list archive

[C de-Avillez <hggdh2@xxxxxxxxxx>]

C de-Avillez has proposed merging lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel into lp:ubuntu-server-iso-testing.

Requested reviews:
  Ubuntu Server Iso Testing Developers (ubuntu-server-iso-testing-dev)

For more details, see:
https://code.launchpad.net/~hggdh2/ubuntu-server-iso-testing/presseds-kernel/+merge/69340

Adjust the server preseeds so that the correct kernel gets loaded on each test.
-- 
https://code.launchpad.net/~hggdh2/ubuntu-server-iso-testing/presseds-kernel/+merge/69340
Your team Ubuntu Server Iso Testing Developers is requested to review the proposed merge of lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel into lp:ubuntu-server-iso-testing.

=== modified file 'run-test.py'
--- run-test.py	2011-06-26 14:06:40 +0000
+++ run-test.py	2011-07-26 18:44:33 +0000
@@ -152,6 +152,7 @@
 
 # Load the templates
 templates = jinja2.Environment(loader = jinja2.FileSystemLoader(TMPL_DIR))
+templates.global = dict (arch = options.arch)
 
 # Load the preseed templates
 preseed_templates = \

=== modified file 'templates/test_cases/default/preseed'
--- templates/test_cases/default/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/default/preseed	2011-07-26 18:44:33 +0000
@@ -19,3 +19,7 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
+

=== modified file 'templates/test_cases/dns-server/preseed'
--- templates/test_cases/dns-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/dns-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, DNS server
 {% endblock %}

=== modified file 'templates/test_cases/lamp/preseed'
--- templates/test_cases/lamp/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/lamp/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server
 {% endblock %}

=== modified file 'templates/test_cases/ltp-lite/preseed'
--- templates/test_cases/ltp-lite/preseed	2010-12-13 20:26:34 +0000
+++ templates/test_cases/ltp-lite/preseed	2011-07-26 18:44:33 +0000
@@ -1,4 +1,7 @@
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block pkgsel_first %}
 d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
 d-i pkgsel/update-policy select No automatic updates

=== modified file 'templates/test_cases/lvm/preseed'
--- templates/test_cases/lvm/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/lvm/preseed	2011-07-26 18:44:33 +0000
@@ -22,3 +22,6 @@
 {% block partman_auto_method %}
 d-i partman-auto/method string lvm
 {% endblock %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}

=== modified file 'templates/test_cases/mail-server/preseed'
--- templates/test_cases/mail-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/mail-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, Mail server
 {% endblock %}

=== modified file 'templates/test_cases/openssh-server/preseed'
--- templates/test_cases/openssh-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/openssh-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server
 {% endblock %}

=== modified file 'templates/test_cases/postgresql-server/preseed'
--- templates/test_cases/postgresql-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/postgresql-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database
 {% endblock %}

=== modified file 'templates/test_cases/print-server/preseed'
--- templates/test_cases/print-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/print-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, Print server
 {% endblock %}

=== modified file 'templates/test_cases/samba-server/preseed'
--- templates/test_cases/samba-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/samba-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server
 {% endblock %}

=== modified file 'templates/test_cases/tomcat-server/preseed'
--- templates/test_cases/tomcat-server/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/tomcat-server/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server
 {% endblock %}

=== modified file 'templates/test_cases/virtual-host/preseed'
--- templates/test_cases/virtual-host/preseed	2010-12-01 17:48:05 +0000
+++ templates/test_cases/virtual-host/preseed	2011-07-26 18:44:33 +0000
@@ -19,6 +19,9 @@
 # 
 
 {% extends "base" %}
+{% block kernel_flavor %}
+d-i     base-installer/kernel/override-image    string linux-server
+{% endblock %}
 {% block tasksel_first %}
 tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host
 {% endblock %}