Merge ~smoser/curtin:fix/bigger-root-volumes into curtin:master

Proposed by Scott Moser
Status: Merged
Approved by: Scott Moser
Approved revision: 510e2c4f16796f434c2dad79663fd6a021b99249
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~smoser/curtin:fix/bigger-root-volumes
Merge into: curtin:master
Diff against target: 62 lines (+6/-6)
2 files modified
examples/tests/mirrorboot-msdos-partition.yaml (+2/-2)
examples/tests/mirrorboot-uefi.yaml (+4/-4)
Reviewer Review Type Date Requested Status
Ryan Harper (community) Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+352566@code.launchpad.net

Commit message

vmtests: Increase size of root filesystems.

I believe that this change removes the final 2G root (/) filesystems.
These 2G filesystems were too small to handle upgrades sometimes.
Things that lead to this state:
 a.) we started testing with propsed enabled (and upgrade to it)
 b.) the failing cases here were Trusty HWE tests, which end up
     getting 2 kernels installed and 2 update-initramfs and such.

That worst case scenario led to the following output of apt:
  Need to get 2404 kB of archives.
  After this operation, 10.9 MB of additional disk space will be used.
  Need to get 1467 kB of archives.
  After this operation, 4904 kB of additional disk space will be used.
  Need to get 68.3 MB of archives.
  After this operation, 308 MB of additional disk space will be used.
  Need to get 63.9 MB of archives.
  After this operation, 275 MB of additional disk space will be used.

Description of the change

see commit message

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

proposed test running at
 https://jenkins.ubuntu.com/server/job/curtin-vmtest-devel-debug/84/console

+ ./tools/jenkins-runner -p 4 tests/vmtests/test_mdadm_bcache.py

CURTIN_VMTEST_ADD_REPOS=proposed
CURTIN_VMTEST_CURTIN_EXE_VERSION=18.1-41-g510e2c4f
CURTIN_VMTEST_CURTIN_VERSION=18.1-41-g510e2c4f

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) wrote :

Is it worth trying to build a common root partition that all of the configs use? If we find out that 3G isn't enough, then how many more files do we touch to bump the value to the next required size?

Possibly not worth the effort since we've gone this long without triggering it.

I'm OK with punting on this.

review: Approve
Revision history for this message
Scott Moser (smoser) wrote :

yah, i'd considered that... just more work and not a lot of reason for that right nw.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/mirrorboot-msdos-partition.yaml b/examples/tests/mirrorboot-msdos-partition.yaml
2index 1ce4220..2b111a7 100644
3--- a/examples/tests/mirrorboot-msdos-partition.yaml
4+++ b/examples/tests/mirrorboot-msdos-partition.yaml
5@@ -47,7 +47,7 @@ storage:
6 name: md0-part1
7 number: 1
8 offset: 4194304B
9- size: 2GB
10+ size: 3GB
11 type: partition
12 uuid: 4f4fa336-2762-48e4-ae54-9451141665cd
13 wipe: superblock
14@@ -55,7 +55,7 @@ storage:
15 id: md0-part2
16 name: md0-part2
17 number: 2
18- size: 2.5GB
19+ size: 1.5GB
20 type: partition
21 uuid: c2d21fd3-3cde-4432-8eab-f08594bbe76e
22 wipe: superblock
23diff --git a/examples/tests/mirrorboot-uefi.yaml b/examples/tests/mirrorboot-uefi.yaml
24index e1f393f..ca55be9 100644
25--- a/examples/tests/mirrorboot-uefi.yaml
26+++ b/examples/tests/mirrorboot-uefi.yaml
27@@ -30,7 +30,7 @@ storage:
28 id: sda-part2
29 name: sda-part2
30 number: 2
31- size: 2G
32+ size: 3G
33 type: partition
34 uuid: 47c97eae-f35d-473f-8f3d-d64161d571f1
35 wipe: superblock
36@@ -38,7 +38,7 @@ storage:
37 id: sda-part3
38 name: sda-part3
39 number: 3
40- size: 2G
41+ size: 1G
42 type: partition
43 uuid: e3202633-841c-4936-a520-b18d1f7938ea
44 wipe: superblock
45@@ -56,7 +56,7 @@ storage:
46 id: sdb-part2
47 name: sdb-part2
48 number: 2
49- size: 2G
50+ size: 3G
51 type: partition
52 uuid: a33a83dd-d1bf-4940-bf3e-6d931de85dbc
53 wipe: superblock
54@@ -72,7 +72,7 @@ storage:
55 id: sdb-part3
56 name: sdb-part3
57 number: 3
58- size: 2G
59+ size: 1G
60 type: partition
61 uuid: 27e29758-fdcf-4c6a-8578-c92f907a8a9d
62 wipe: superblock

Subscribers

People subscribed via source and target branches