ubuntu-server-iso-testing

Merge lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel into lp:ubuntu-server-iso-testing

  1. presseds-kernel
  2. Merge into trunk
Proposed by C de-Avillez
Status: Merged
Merged at revision: 228
Proposed branch: lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel
Merge into: lp:ubuntu-server-iso-testing
Diff against target: 160 lines (+37/-0)
12 files modified
templates/test_cases/default/preseed (+4/-0)
templates/test_cases/dns-server/preseed (+3/-0)
templates/test_cases/lamp/preseed (+3/-0)
templates/test_cases/ltp-lite/preseed (+3/-0)
templates/test_cases/lvm/preseed (+3/-0)
templates/test_cases/mail-server/preseed (+3/-0)
templates/test_cases/openssh-server/preseed (+3/-0)
templates/test_cases/postgresql-server/preseed (+3/-0)
templates/test_cases/print-server/preseed (+3/-0)
templates/test_cases/samba-server/preseed (+3/-0)
templates/test_cases/tomcat-server/preseed (+3/-0)
templates/test_cases/virtual-host/preseed (+3/-0)
To merge this branch: bzr merge lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel
Reviewer Review Type Date Requested Status
C de-Avillez (community) Approve
Review via email: mp+69340@code.launchpad.net

Description of the change

Adjust the server preseeds so that the correct kernel gets loaded on each test.

To post a comment you must log in.
lp:~hggdh2/ubuntu-server-iso-testing/presseds-kernel updated
228. By C de-Avillez

  templates/test_cases/default/preseed
  templates/test_cases/dns-server/preseed
  templates/test_cases/lamp/preseed
  templates/test_cases/ltp-lite/preseed
  templates/test_cases/lvm/preseed
  templates/test_cases/mail-server/preseed
  templates/test_cases/openssh-server/preseed
  templates/test_cases/postgresql-server/preseed
  templates/test_cases/print-server/preseed
  templates/test_cases/samba-server/preseed
  templates/test_cases/tomcat-server/preseed
  templates/test_cases/virtual-host/preseed
  * make sure to select the correct kernel image.

Revision history for this message
C de-Avillez (hggdh2) wrote :

retracted a change to ~/run-test.py (noticed by Jean-Baptiste): my initial approach had been to pass the kernel via parameter, and have Jinja2 do the magic... but it was less intrusive to just change the kernel image selection. When I undid my changes, I forgot one line in run-test.py.

Self-approving, based on comments from Jean-Baptiste.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/test_cases/default/preseed'
2--- templates/test_cases/default/preseed 2010-12-01 17:48:05 +0000
3+++ templates/test_cases/default/preseed 2011-07-26 22:41:31 +0000
4@@ -19,3 +19,7 @@
5 #
6
7 {% extends "base" %}
8+{% block kernel_flavor %}
9+d-i base-installer/kernel/override-image string linux-server
10+{% endblock %}
11+
12
13=== modified file 'templates/test_cases/dns-server/preseed'
14--- templates/test_cases/dns-server/preseed 2010-12-01 17:48:05 +0000
15+++ templates/test_cases/dns-server/preseed 2011-07-26 22:41:31 +0000
16@@ -19,6 +19,9 @@
17 #
18
19 {% extends "base" %}
20+{% block kernel_flavor %}
21+d-i base-installer/kernel/override-image string linux-server
22+{% endblock %}
23 {% block tasksel_first %}
24 tasksel tasksel/first multiselect Basic Ubuntu server, DNS server
25 {% endblock %}
26
27=== modified file 'templates/test_cases/lamp/preseed'
28--- templates/test_cases/lamp/preseed 2010-12-01 17:48:05 +0000
29+++ templates/test_cases/lamp/preseed 2011-07-26 22:41:31 +0000
30@@ -19,6 +19,9 @@
31 #
32
33 {% extends "base" %}
34+{% block kernel_flavor %}
35+d-i base-installer/kernel/override-image string linux-server
36+{% endblock %}
37 {% block tasksel_first %}
38 tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server
39 {% endblock %}
40
41=== modified file 'templates/test_cases/ltp-lite/preseed'
42--- templates/test_cases/ltp-lite/preseed 2010-12-13 20:26:34 +0000
43+++ templates/test_cases/ltp-lite/preseed 2011-07-26 22:41:31 +0000
44@@ -1,4 +1,7 @@
45 {% extends "base" %}
46+{% block kernel_flavor %}
47+d-i base-installer/kernel/override-image string linux-server
48+{% endblock %}
49 {% block pkgsel_first %}
50 d-i pkgsel/include string openssh-server python-couchdb subunit python-subunit python-junitxml ltp build-essential
51 d-i pkgsel/update-policy select No automatic updates
52
53=== modified file 'templates/test_cases/lvm/preseed'
54--- templates/test_cases/lvm/preseed 2010-12-01 17:48:05 +0000
55+++ templates/test_cases/lvm/preseed 2011-07-26 22:41:31 +0000
56@@ -22,3 +22,6 @@
57 {% block partman_auto_method %}
58 d-i partman-auto/method string lvm
59 {% endblock %}
60+{% block kernel_flavor %}
61+d-i base-installer/kernel/override-image string linux-server
62+{% endblock %}
63
64=== modified file 'templates/test_cases/mail-server/preseed'
65--- templates/test_cases/mail-server/preseed 2010-12-01 17:48:05 +0000
66+++ templates/test_cases/mail-server/preseed 2011-07-26 22:41:31 +0000
67@@ -19,6 +19,9 @@
68 #
69
70 {% extends "base" %}
71+{% block kernel_flavor %}
72+d-i base-installer/kernel/override-image string linux-server
73+{% endblock %}
74 {% block tasksel_first %}
75 tasksel tasksel/first multiselect Basic Ubuntu server, Mail server
76 {% endblock %}
77
78=== modified file 'templates/test_cases/openssh-server/preseed'
79--- templates/test_cases/openssh-server/preseed 2010-12-01 17:48:05 +0000
80+++ templates/test_cases/openssh-server/preseed 2011-07-26 22:41:31 +0000
81@@ -19,6 +19,9 @@
82 #
83
84 {% extends "base" %}
85+{% block kernel_flavor %}
86+d-i base-installer/kernel/override-image string linux-server
87+{% endblock %}
88 {% block tasksel_first %}
89 tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server
90 {% endblock %}
91
92=== modified file 'templates/test_cases/postgresql-server/preseed'
93--- templates/test_cases/postgresql-server/preseed 2010-12-01 17:48:05 +0000
94+++ templates/test_cases/postgresql-server/preseed 2011-07-26 22:41:31 +0000
95@@ -19,6 +19,9 @@
96 #
97
98 {% extends "base" %}
99+{% block kernel_flavor %}
100+d-i base-installer/kernel/override-image string linux-server
101+{% endblock %}
102 {% block tasksel_first %}
103 tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database
104 {% endblock %}
105
106=== modified file 'templates/test_cases/print-server/preseed'
107--- templates/test_cases/print-server/preseed 2010-12-01 17:48:05 +0000
108+++ templates/test_cases/print-server/preseed 2011-07-26 22:41:31 +0000
109@@ -19,6 +19,9 @@
110 #
111
112 {% extends "base" %}
113+{% block kernel_flavor %}
114+d-i base-installer/kernel/override-image string linux-server
115+{% endblock %}
116 {% block tasksel_first %}
117 tasksel tasksel/first multiselect Basic Ubuntu server, Print server
118 {% endblock %}
119
120=== modified file 'templates/test_cases/samba-server/preseed'
121--- templates/test_cases/samba-server/preseed 2010-12-01 17:48:05 +0000
122+++ templates/test_cases/samba-server/preseed 2011-07-26 22:41:31 +0000
123@@ -19,6 +19,9 @@
124 #
125
126 {% extends "base" %}
127+{% block kernel_flavor %}
128+d-i base-installer/kernel/override-image string linux-server
129+{% endblock %}
130 {% block tasksel_first %}
131 tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server
132 {% endblock %}
133
134=== modified file 'templates/test_cases/tomcat-server/preseed'
135--- templates/test_cases/tomcat-server/preseed 2010-12-01 17:48:05 +0000
136+++ templates/test_cases/tomcat-server/preseed 2011-07-26 22:41:31 +0000
137@@ -19,6 +19,9 @@
138 #
139
140 {% extends "base" %}
141+{% block kernel_flavor %}
142+d-i base-installer/kernel/override-image string linux-server
143+{% endblock %}
144 {% block tasksel_first %}
145 tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server
146 {% endblock %}
147
148=== modified file 'templates/test_cases/virtual-host/preseed'
149--- templates/test_cases/virtual-host/preseed 2010-12-01 17:48:05 +0000
150+++ templates/test_cases/virtual-host/preseed 2011-07-26 22:41:31 +0000
151@@ -19,6 +19,9 @@
152 #
153
154 {% extends "base" %}
155+{% block kernel_flavor %}
156+d-i base-installer/kernel/override-image string linux-server
157+{% endblock %}
158 {% block tasksel_first %}
159 tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host
160 {% endblock %}

Subscribers

People subscribed via source and target branches