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
diff --git a/examples/tests/mirrorboot-msdos-partition.yaml b/examples/tests/mirrorboot-msdos-partition.yaml
index 1ce4220..2b111a7 100644
--- a/examples/tests/mirrorboot-msdos-partition.yaml
+++ b/examples/tests/mirrorboot-msdos-partition.yaml
@@ -47,7 +47,7 @@ storage:
47 name: md0-part147 name: md0-part1
48 number: 148 number: 1
49 offset: 4194304B49 offset: 4194304B
50 size: 2GB50 size: 3GB
51 type: partition51 type: partition
52 uuid: 4f4fa336-2762-48e4-ae54-9451141665cd52 uuid: 4f4fa336-2762-48e4-ae54-9451141665cd
53 wipe: superblock53 wipe: superblock
@@ -55,7 +55,7 @@ storage:
55 id: md0-part255 id: md0-part2
56 name: md0-part256 name: md0-part2
57 number: 257 number: 2
58 size: 2.5GB58 size: 1.5GB
59 type: partition59 type: partition
60 uuid: c2d21fd3-3cde-4432-8eab-f08594bbe76e60 uuid: c2d21fd3-3cde-4432-8eab-f08594bbe76e
61 wipe: superblock61 wipe: superblock
diff --git a/examples/tests/mirrorboot-uefi.yaml b/examples/tests/mirrorboot-uefi.yaml
index e1f393f..ca55be9 100644
--- a/examples/tests/mirrorboot-uefi.yaml
+++ b/examples/tests/mirrorboot-uefi.yaml
@@ -30,7 +30,7 @@ storage:
30 id: sda-part230 id: sda-part2
31 name: sda-part231 name: sda-part2
32 number: 232 number: 2
33 size: 2G33 size: 3G
34 type: partition34 type: partition
35 uuid: 47c97eae-f35d-473f-8f3d-d64161d571f135 uuid: 47c97eae-f35d-473f-8f3d-d64161d571f1
36 wipe: superblock36 wipe: superblock
@@ -38,7 +38,7 @@ storage:
38 id: sda-part338 id: sda-part3
39 name: sda-part339 name: sda-part3
40 number: 340 number: 3
41 size: 2G41 size: 1G
42 type: partition42 type: partition
43 uuid: e3202633-841c-4936-a520-b18d1f7938ea43 uuid: e3202633-841c-4936-a520-b18d1f7938ea
44 wipe: superblock44 wipe: superblock
@@ -56,7 +56,7 @@ storage:
56 id: sdb-part256 id: sdb-part2
57 name: sdb-part257 name: sdb-part2
58 number: 258 number: 2
59 size: 2G59 size: 3G
60 type: partition60 type: partition
61 uuid: a33a83dd-d1bf-4940-bf3e-6d931de85dbc61 uuid: a33a83dd-d1bf-4940-bf3e-6d931de85dbc
62 wipe: superblock62 wipe: superblock
@@ -72,7 +72,7 @@ storage:
72 id: sdb-part372 id: sdb-part3
73 name: sdb-part373 name: sdb-part3
74 number: 374 number: 3
75 size: 2G75 size: 1G
76 type: partition76 type: partition
77 uuid: 27e29758-fdcf-4c6a-8578-c92f907a8a9d77 uuid: 27e29758-fdcf-4c6a-8578-c92f907a8a9d
78 wipe: superblock78 wipe: superblock

Subscribers

People subscribed via source and target branches