Ubuntu Test Cases

Merge lp:~paride/ubuntu-test-cases/s390x into lp:ubuntu-test-cases/server

  1. s390x
  2. Merge into server-tests-raring
Proposed by Paride Legovini
Status: Merged
Approved by: Joshua Powers
Approved revision: no longer in the source branch.
Merged at revision: 179
Proposed branch: lp:~paride/ubuntu-test-cases/s390x
Merge into: lp:ubuntu-test-cases/server
Diff against target: 194 lines (+22/-14)
14 files modified
preseeds/default.preseed (+9/-1)
preseeds/dns-server.preseed (+1/-1)
preseeds/lamp-reboot.preseed (+1/-1)
preseeds/lamp.preseed (+1/-1)
preseeds/lvm.preseed (+1/-1)
preseeds/mail-server.preseed (+1/-1)
preseeds/minimal-virtual.preseed (+1/-1)
preseeds/multi-lvm.preseed (+1/-1)
preseeds/openssh-server.preseed (+1/-1)
preseeds/postgresql-server.preseed (+1/-1)
preseeds/print-server.preseed (+1/-1)
preseeds/samba-server.preseed (+1/-1)
preseeds/tomcat-server.preseed (+1/-1)
preseeds/virtual-host.preseed (+1/-1)
To merge this branch: bzr merge lp:~paride/ubuntu-test-cases/s390x
Reviewer Review Type Date Requested Status
Joshua Powers (community) Approve
Review via email: mp+364965@code.launchpad.net

Commit message

Preseed fixes:
 - all: set the http/proxy to the empty string instead of "None"
 - default: configure the ssh network-console (needed for s390x)

To post a comment you must log in.
Revision history for this message
Joshua Powers (powersj) wrote :

I am assuming and empty string will work the same as "None" so we do not regress the amd64/ppc64el tests.

review: Approve
lp:~paride/ubuntu-test-cases/s390x updated
179. By Joshua Powers

Preseed fixes:
 - all: set the http/proxy to the empty string instead of "None"
 - default: configure the ssh network-console (needed for s390x)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'preseeds/default.preseed'
2--- preseeds/default.preseed 2017-11-15 22:03:08 +0000
3+++ preseeds/default.preseed 2019-03-22 14:51:41 +0000
4@@ -75,12 +75,20 @@
5 # The wacky dhcp hostname that some ISPs use as a password of sorts.
6 #d-i netcfg/dhcp_hostname string radish
7
8+# The installer on s390x runs in netboot mode and has two stages: the initial
9+# stage (before networking has been started in the installer, usually run at
10+# the console) and the second stage that is usually run via ssh.
11+#
12+# These are the answers needed to configure the ssh network-console.
13+d-i network-console/password password pass4install
14+d-i network-console/password-again password pass4install
15+d-i network-console/start note
16
17 ### Mirror settings
18 #d-i mirror/country string enter information manually
19 #d-i mirror/http/hostname string mirror:3142
20 #d-i mirror/http/directory string /ubuntu
21-d-i mirror/http/proxy string None
22+d-i mirror/http/proxy string
23
24 # Suite to install.
25 #d-i mirror/suite string feisty
26
27=== modified file 'preseeds/dns-server.preseed'
28--- preseeds/dns-server.preseed 2017-11-15 22:03:08 +0000
29+++ preseeds/dns-server.preseed 2019-03-22 14:51:41 +0000
30@@ -80,7 +80,7 @@
31 #d-i mirror/country string enter information manually
32 #d-i mirror/http/hostname string mirror:3142
33 #d-i mirror/http/directory string /ubuntu
34-d-i mirror/http/proxy string None
35+d-i mirror/http/proxy string
36
37 # Suite to install.
38 #d-i mirror/suite string feisty
39
40=== modified file 'preseeds/lamp-reboot.preseed'
41--- preseeds/lamp-reboot.preseed 2017-11-15 22:03:08 +0000
42+++ preseeds/lamp-reboot.preseed 2019-03-22 14:51:41 +0000
43@@ -80,7 +80,7 @@
44 #d-i mirror/country string enter information manually
45 #d-i mirror/http/hostname string mirror:3142
46 #d-i mirror/http/directory string /ubuntu
47-d-i mirror/http/proxy string None
48+d-i mirror/http/proxy string
49
50 # Suite to install.
51 #d-i mirror/suite string feisty
52
53=== modified file 'preseeds/lamp.preseed'
54--- preseeds/lamp.preseed 2017-11-15 22:03:08 +0000
55+++ preseeds/lamp.preseed 2019-03-22 14:51:41 +0000
56@@ -80,7 +80,7 @@
57 #d-i mirror/country string enter information manually
58 #d-i mirror/http/hostname string mirror:3142
59 #d-i mirror/http/directory string /ubuntu
60-d-i mirror/http/proxy string None
61+d-i mirror/http/proxy string
62
63 # Suite to install.
64 #d-i mirror/suite string feisty
65
66=== modified file 'preseeds/lvm.preseed'
67--- preseeds/lvm.preseed 2017-11-15 22:03:08 +0000
68+++ preseeds/lvm.preseed 2019-03-22 14:51:41 +0000
69@@ -80,7 +80,7 @@
70 #d-i mirror/country string enter information manually
71 #d-i mirror/http/hostname string mirror:3142
72 #d-i mirror/http/directory string /ubuntu
73-d-i mirror/http/proxy string None
74+d-i mirror/http/proxy string
75
76 # Suite to install.
77 #d-i mirror/suite string feisty
78
79=== modified file 'preseeds/mail-server.preseed'
80--- preseeds/mail-server.preseed 2017-11-15 22:03:08 +0000
81+++ preseeds/mail-server.preseed 2019-03-22 14:51:41 +0000
82@@ -80,7 +80,7 @@
83 #d-i mirror/country string enter information manually
84 #d-i mirror/http/hostname string mirror:3142
85 #d-i mirror/http/directory string /ubuntu
86-d-i mirror/http/proxy string None
87+d-i mirror/http/proxy string
88
89 # Suite to install.
90 #d-i mirror/suite string feisty
91
92=== modified file 'preseeds/minimal-virtual.preseed'
93--- preseeds/minimal-virtual.preseed 2017-11-15 22:03:08 +0000
94+++ preseeds/minimal-virtual.preseed 2019-03-22 14:51:41 +0000
95@@ -80,7 +80,7 @@
96 #d-i mirror/country string enter information manually
97 #d-i mirror/http/hostname string mirror:3142
98 #d-i mirror/http/directory string /ubuntu
99-d-i mirror/http/proxy string None
100+d-i mirror/http/proxy string
101
102 # Suite to install.
103 #d-i mirror/suite string feisty
104
105=== modified file 'preseeds/multi-lvm.preseed'
106--- preseeds/multi-lvm.preseed 2017-11-15 22:03:08 +0000
107+++ preseeds/multi-lvm.preseed 2019-03-22 14:51:41 +0000
108@@ -80,7 +80,7 @@
109 #d-i mirror/country string enter information manually
110 #d-i mirror/http/hostname string mirror:3142
111 #d-i mirror/http/directory string /ubuntu
112-d-i mirror/http/proxy string None
113+d-i mirror/http/proxy string
114
115 # Suite to install.
116 #d-i mirror/suite string feisty
117
118=== modified file 'preseeds/openssh-server.preseed'
119--- preseeds/openssh-server.preseed 2017-11-15 22:03:08 +0000
120+++ preseeds/openssh-server.preseed 2019-03-22 14:51:41 +0000
121@@ -80,7 +80,7 @@
122 #d-i mirror/country string enter information manually
123 #d-i mirror/http/hostname string mirror:3142
124 #d-i mirror/http/directory string /ubuntu
125-d-i mirror/http/proxy string None
126+d-i mirror/http/proxy string
127
128 # Suite to install.
129 #d-i mirror/suite string feisty
130
131=== modified file 'preseeds/postgresql-server.preseed'
132--- preseeds/postgresql-server.preseed 2017-11-15 22:03:08 +0000
133+++ preseeds/postgresql-server.preseed 2019-03-22 14:51:41 +0000
134@@ -80,7 +80,7 @@
135 #d-i mirror/country string enter information manually
136 #d-i mirror/http/hostname string mirror:3142
137 #d-i mirror/http/directory string /ubuntu
138-d-i mirror/http/proxy string None
139+d-i mirror/http/proxy string
140
141 # Suite to install.
142 #d-i mirror/suite string feisty
143
144=== modified file 'preseeds/print-server.preseed'
145--- preseeds/print-server.preseed 2017-11-15 22:03:08 +0000
146+++ preseeds/print-server.preseed 2019-03-22 14:51:41 +0000
147@@ -80,7 +80,7 @@
148 #d-i mirror/country string enter information manually
149 #d-i mirror/http/hostname string mirror:3142
150 #d-i mirror/http/directory string /ubuntu
151-d-i mirror/http/proxy string None
152+d-i mirror/http/proxy string
153
154 # Suite to install.
155 #d-i mirror/suite string feisty
156
157=== modified file 'preseeds/samba-server.preseed'
158--- preseeds/samba-server.preseed 2017-11-15 22:03:08 +0000
159+++ preseeds/samba-server.preseed 2019-03-22 14:51:41 +0000
160@@ -80,7 +80,7 @@
161 #d-i mirror/country string enter information manually
162 #d-i mirror/http/hostname string mirror:3142
163 #d-i mirror/http/directory string /ubuntu
164-d-i mirror/http/proxy string None
165+d-i mirror/http/proxy string
166
167 # Suite to install.
168 #d-i mirror/suite string feisty
169
170=== modified file 'preseeds/tomcat-server.preseed'
171--- preseeds/tomcat-server.preseed 2017-11-15 22:03:08 +0000
172+++ preseeds/tomcat-server.preseed 2019-03-22 14:51:41 +0000
173@@ -80,7 +80,7 @@
174 #d-i mirror/country string enter information manually
175 #d-i mirror/http/hostname string mirror:3142
176 #d-i mirror/http/directory string /ubuntu
177-d-i mirror/http/proxy string None
178+d-i mirror/http/proxy string
179
180 # Suite to install.
181 #d-i mirror/suite string feisty
182
183=== modified file 'preseeds/virtual-host.preseed'
184--- preseeds/virtual-host.preseed 2017-11-15 22:03:08 +0000
185+++ preseeds/virtual-host.preseed 2019-03-22 14:51:41 +0000
186@@ -80,7 +80,7 @@
187 #d-i mirror/country string enter information manually
188 #d-i mirror/http/hostname string mirror:3142
189 #d-i mirror/http/directory string /ubuntu
190-d-i mirror/http/proxy string None
191+d-i mirror/http/proxy string
192
193 # Suite to install.
194 #d-i mirror/suite string feisty

Subscribers

People subscribed via source and target branches

to all changes: