curtin

Merge ~mwhudson/curtin:add-offsets-to-examples into curtin:master

  1. Git
  2. lp:~mwhudson/curtin
  3. add-offsets-to-examples
  4. Merge into master
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: ccfbc9d514362a22b59c46a57a36edb34b8b36e3
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:add-offsets-to-examples
Merge into: curtin:master
Diff against target: 267 lines (+28/-0)
12 files modified
examples/tests/multipath-reuse.yaml (+2/-0)
examples/tests/partition-existing-raid.yaml (+2/-0)
examples/tests/preserve-bcache.yaml (+2/-0)
examples/tests/preserve-lvm.yaml (+2/-0)
examples/tests/preserve-partition-wipe-vg-simple.yaml (+2/-0)
examples/tests/preserve-partition-wipe-vg.yaml (+4/-0)
examples/tests/preserve-raid.yaml (+2/-0)
examples/tests/preserve.yaml (+3/-0)
examples/tests/reuse-lvm-member-partition.yaml (+2/-0)
examples/tests/reuse-msdos-partitions.yaml (+4/-0)
examples/tests/reuse-raid-member-wipe-partition.yaml (+2/-0)
examples/tests/uefi_reuse_esp.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+415997@code.launchpad.net

Commit message

examples: add offsets to preserved partitions

Specifying the offset on a preserved partition is required with a v2
config when the partition does not immediately follow (up to alignment)
the preceding one.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:b6304ffe0c3a0361b21bbcef6d04c528fac7282a
https://jenkins.ubuntu.com/server/job/curtin-ci/260/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/260/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/260/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/260/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/260/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/260//rebuild

review: Needs Fixing (continuous-integration)
~mwhudson/curtin:add-offsets-to-examples updated
ccfbc9d... by Michael Hudson-Doyle

oops

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:ccfbc9d514362a22b59c46a57a36edb34b8b36e3
https://jenkins.ubuntu.com/server/job/curtin-ci/263/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/263/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/263/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/263/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/263/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/263//rebuild

review: Approve (continuous-integration)
Revision history for this message
Dan Bungert (dbungert) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/multipath-reuse.yaml b/examples/tests/multipath-reuse.yaml
2index 24e193e..801111e 100644
3--- a/examples/tests/multipath-reuse.yaml
4+++ b/examples/tests/multipath-reuse.yaml
5@@ -36,12 +36,14 @@ storage:
6 device: sda
7 flag: boot
8 preserve: true
9+ offset: 1G
10 - id: sda2
11 type: partition
12 number: 2
13 size: 1GB
14 device: sda
15 preserve: true
16+ offset: 4G
17 - id: sda1_root
18 type: format
19 fstype: ext4
20diff --git a/examples/tests/partition-existing-raid.yaml b/examples/tests/partition-existing-raid.yaml
21index 6292fef..423ab85 100644
22--- a/examples/tests/partition-existing-raid.yaml
23+++ b/examples/tests/partition-existing-raid.yaml
24@@ -63,6 +63,7 @@ storage:
25 flag: boot
26 number: 1
27 size: 8G
28+ offset: 1G
29 preserve: true
30 - type: partition
31 id: id_disk2_part1
32@@ -70,6 +71,7 @@ storage:
33 flag: boot
34 number: 1
35 size: 8G
36+ offset: 1G
37 preserve: true
38 - type: raid
39 id: raid-md1
40diff --git a/examples/tests/preserve-bcache.yaml b/examples/tests/preserve-bcache.yaml
41index 17ad52c..13f8d54 100644
42--- a/examples/tests/preserve-bcache.yaml
43+++ b/examples/tests/preserve-bcache.yaml
44@@ -47,6 +47,7 @@ storage:
45 size: 1024M
46 preserve: true
47 wipe: superblock
48+ offset: 1M
49 - id: id_rotary0_part2
50 type: partition
51 name: rotary0-part2
52@@ -54,6 +55,7 @@ storage:
53 number: 2
54 size: 8G
55 preserve: true
56+ offset: 1026M
57 - id: id_bcache0
58 type: bcache
59 name: bcache0
60diff --git a/examples/tests/preserve-lvm.yaml b/examples/tests/preserve-lvm.yaml
61index a939759..58bfa1f 100644
62--- a/examples/tests/preserve-lvm.yaml
63+++ b/examples/tests/preserve-lvm.yaml
64@@ -47,6 +47,7 @@ storage:
65 device: main_disk
66 flag: bios_grub
67 preserve: true
68+ offset: 1MB
69 - id: main_disk_p2
70 type: partition
71 number: 2
72@@ -54,6 +55,7 @@ storage:
73 device: main_disk
74 flag: boot
75 preserve: true
76+ offset: 3MB
77 - id: root_vg
78 type: lvm_volgroup
79 name: root_vg
80diff --git a/examples/tests/preserve-partition-wipe-vg-simple.yaml b/examples/tests/preserve-partition-wipe-vg-simple.yaml
81index e1f0b9e..9876b42 100644
82--- a/examples/tests/preserve-partition-wipe-vg-simple.yaml
83+++ b/examples/tests/preserve-partition-wipe-vg-simple.yaml
84@@ -39,6 +39,7 @@ storage:
85 number: 1
86 type: partition
87 id: disk-sda-part-1
88+ offset: 2M
89 - device: disk-sda
90 size: 3G
91 flag: linux
92@@ -47,6 +48,7 @@ storage:
93 wipe: zero
94 type: partition
95 id: disk-sda-part-2
96+ offset: 4G
97 - fstype: ext4
98 volume: disk-sda-part-2
99 preserve: false
100diff --git a/examples/tests/preserve-partition-wipe-vg.yaml b/examples/tests/preserve-partition-wipe-vg.yaml
101index 27a4235..5e35a54 100644
102--- a/examples/tests/preserve-partition-wipe-vg.yaml
103+++ b/examples/tests/preserve-partition-wipe-vg.yaml
104@@ -51,6 +51,7 @@ storage:
105 wipe: zero
106 type: partition
107 id: disk-sda-part-1
108+ offset: 2M
109 - device: disk-sda
110 size: 3G
111 flag: linux
112@@ -58,6 +59,7 @@ storage:
113 wipe: zero
114 type: partition
115 id: disk-sda-part-2
116+ offset: 1G
117 - device: disk-sdb
118 flag: linux
119 size: 3G
120@@ -65,12 +67,14 @@ storage:
121 wipe: zero
122 type: partition
123 id: disk-sdb-part-1
124+ offset: 1G
125 - device: disk-sdb
126 flag: linux
127 size: 3G
128 preserve: true
129 type: partition
130 id: disk-sdb-part-2
131+ offset: 4G
132 - fstype: ext4
133 volume: disk-sda-part-2
134 preserve: false
135diff --git a/examples/tests/preserve-raid.yaml b/examples/tests/preserve-raid.yaml
136index 5c94032..3d39c80 100644
137--- a/examples/tests/preserve-raid.yaml
138+++ b/examples/tests/preserve-raid.yaml
139@@ -65,6 +65,7 @@ storage:
140 number: 1
141 size: 8G
142 preserve: true
143+ offset: 1G
144 - type: partition
145 id: id_disk2_part1
146 device: id_disk2
147@@ -72,6 +73,7 @@ storage:
148 number: 1
149 size: 8G
150 preserve: true
151+ offset: 1G
152 - type: raid
153 id: raid-md1
154 name: md1
155diff --git a/examples/tests/preserve.yaml b/examples/tests/preserve.yaml
156index 9da2a0e..2cf692e 100644
157--- a/examples/tests/preserve.yaml
158+++ b/examples/tests/preserve.yaml
159@@ -32,18 +32,21 @@ storage:
160 number: 1
161 size: 512M
162 preserve: true
163+ offset: 2M
164 - type: partition
165 id: id_disk0_part2
166 device: id_disk0
167 number: 2
168 size: 4G
169 preserve: true
170+ offset: 1G
171 - type: partition
172 id: id_disk0_part3
173 device: id_disk0
174 number: 3
175 size: 3G
176 preserve: true
177+ offset: 6G
178 - type: format
179 id: id_efi_format
180 volume: id_disk0_part1
181diff --git a/examples/tests/reuse-lvm-member-partition.yaml b/examples/tests/reuse-lvm-member-partition.yaml
182index fd8f602..cad1474 100644
183--- a/examples/tests/reuse-lvm-member-partition.yaml
184+++ b/examples/tests/reuse-lvm-member-partition.yaml
185@@ -69,12 +69,14 @@ storage:
186 flag: boot
187 number: 1
188 size: 1G
189+ offset: 1G
190 - type: partition
191 id: id_disk0_part2
192 preserve: true
193 device: id_disk0
194 number: 2
195 size: 7G
196+ offset: 2G
197 - type: format
198 id: id_efi_format
199 volume: id_disk0_part1
200diff --git a/examples/tests/reuse-msdos-partitions.yaml b/examples/tests/reuse-msdos-partitions.yaml
201index d444517..f3c6974 100644
202--- a/examples/tests/reuse-msdos-partitions.yaml
203+++ b/examples/tests/reuse-msdos-partitions.yaml
204@@ -43,6 +43,7 @@ storage:
205 flag: boot
206 preserve: true
207 wipe: superblock
208+ offset: 1M
209 - id: sda2
210 type: partition
211 number: 2
212@@ -50,6 +51,7 @@ storage:
213 flag: extended
214 device: sda
215 preserve: true
216+ offset: 3074M
217 - id: sda5
218 type: partition
219 number: 5
220@@ -58,6 +60,7 @@ storage:
221 device: sda
222 preserve: true
223 wipe: superblock
224+ offset: 3075M
225 - id: sda6
226 type: partition
227 number: 6
228@@ -66,6 +69,7 @@ storage:
229 device: sda
230 preserve: true
231 wipe: superblock
232+ offset: 5123M
233 - id: sda1_root
234 type: format
235 fstype: ext4
236diff --git a/examples/tests/reuse-raid-member-wipe-partition.yaml b/examples/tests/reuse-raid-member-wipe-partition.yaml
237index d20b79c..136f96e 100644
238--- a/examples/tests/reuse-raid-member-wipe-partition.yaml
239+++ b/examples/tests/reuse-raid-member-wipe-partition.yaml
240@@ -49,6 +49,7 @@ storage:
241 flag: boot
242 number: 1
243 size: 1G
244+ offset: 1G
245 - type: partition
246 id: id_disk0_part2
247 preserve: true
248@@ -56,6 +57,7 @@ storage:
249 number: 2
250 size: 7G
251 wipe: superblock
252+ offset: 2G
253 - type: format
254 id: id_efi_format
255 volume: id_disk0_part1
256diff --git a/examples/tests/uefi_reuse_esp.yaml b/examples/tests/uefi_reuse_esp.yaml
257index 7095f91..0232019 100644
258--- a/examples/tests/uefi_reuse_esp.yaml
259+++ b/examples/tests/uefi_reuse_esp.yaml
260@@ -70,6 +70,7 @@ storage:
261 size: 4G
262 type: partition
263 preserve: true
264+ offset: 513M
265 - fstype: fat32
266 id: id_efi_format
267 label: efi

Subscribers

People subscribed via source and target branches