curtin-dev team mailing list archive

[Michael Hudson-Doyle <mp+415877@xxxxxxxxxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:vmtest-fixes into curtin:master.

Commit message:
vmtests: assorted fixes

vmtests: drop assertion that clear-holders ran
vmtests: bump VM memory size to 2048 MiB for all tests
vmtests: fix parted invocation in partition-existing-raid.yaml
vmtests: boost the size of / in a few tests
insert sleep after creating bcache device in preserve-bcache.yaml


Requested reviews:
  Server Team CI bot (server-team-bot): continuous-integration
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/415877

I looked through all the failures of the most recent vmtests run and this is most of what I found (I sent a separate MP for the one change I want to make to curtin itself).

It probably makes sense to merge this by hand -- I don't want to squash merge it, and splitting each commit out into it's own MP sounds boring.
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:vmtest-fixes into curtin:master.

diff --git a/examples/tests/multipath-lvm-part-wipe.yaml b/examples/tests/multipath-lvm-part-wipe.yaml
index cb18a08..8400d78 100644
--- a/examples/tests/multipath-lvm-part-wipe.yaml
+++ b/examples/tests/multipath-lvm-part-wipe.yaml
@@ -113,7 +113,7 @@ storage:
       - id: root_vg_lv1
         type: lvm_partition
         name: lv1_root
-        size: 2.5G
+        size: 3.5G
         volgroup: root_vg
       - id: lv1_root_fs
         type: format
diff --git a/examples/tests/multipath.yaml b/examples/tests/multipath.yaml
index 11838d1..a3b536f 100644
--- a/examples/tests/multipath.yaml
+++ b/examples/tests/multipath.yaml
@@ -16,7 +16,7 @@ storage:
       - id: sda1
         type: partition
         number: 1
-        size: 3GB
+        size: 4GB
         device: sda
         flag: boot
         wipe: superblock
diff --git a/examples/tests/partition-existing-raid.yaml b/examples/tests/partition-existing-raid.yaml
index 07cf8d2..170cb9e 100644
--- a/examples/tests/partition-existing-raid.yaml
+++ b/examples/tests/partition-existing-raid.yaml
@@ -15,7 +15,7 @@ bucket:
         /dev/disk/by-id/virtio-disk-b-part1 /dev/disk/by-id/virtio-disk-c-part1
     udevadm settle
     parted /dev/md1 --script -- \
-        mklabel dos
+        mklabel msdos
     udevadm settle
     mdadm --stop /dev/md1
     udevadm settle
diff --git a/examples/tests/preserve-bcache.yaml b/examples/tests/preserve-bcache.yaml
index f614f37..17ad52c 100644
--- a/examples/tests/preserve-bcache.yaml
+++ b/examples/tests/preserve-bcache.yaml
@@ -10,6 +10,7 @@ bucket:
     udevadm settle
     make-bcache -C /dev/disk/by-id/virtio-disk-b \
                 -B /dev/disk/by-id/virtio-disk-a-part2 --writeback
+    sleep 1
     udevadm settle
     mkfs.ext4 /dev/bcache0
     mount /dev/bcache0 /mnt
diff --git a/examples/tests/preserve-raid.yaml b/examples/tests/preserve-raid.yaml
index 9e0489f..5c94032 100644
--- a/examples/tests/preserve-raid.yaml
+++ b/examples/tests/preserve-raid.yaml
@@ -52,7 +52,7 @@ storage:
     id: id_disk0_part2
     device: id_disk0
     number: 2
-    size: 3G
+    size: 4G
   - type: partition
     id: id_disk0_part3
     device: id_disk0
diff --git a/examples/tests/preserve.yaml b/examples/tests/preserve.yaml
index de8a975..319c502 100644
--- a/examples/tests/preserve.yaml
+++ b/examples/tests/preserve.yaml
@@ -36,7 +36,7 @@ storage:
     id: id_disk0_part2
     device: id_disk0
     number: 2
-    size: 3G
+    size: 4G
     preserve: true
   - type: partition
     id: id_disk0_part3
diff --git a/examples/tests/uefi_basic.yaml b/examples/tests/uefi_basic.yaml
index 91a72ae..e6ad351 100644
--- a/examples/tests/uefi_basic.yaml
+++ b/examples/tests/uefi_basic.yaml
@@ -31,7 +31,7 @@ storage:
   - device: id_disk0
     id: id_disk0_part2
     number: 2
-    size: 3G
+    size: 4G
     type: partition
     wipe: superblock
   - fstype: fat32
diff --git a/examples/tests/uefi_reuse_esp.yaml b/examples/tests/uefi_reuse_esp.yaml
index 7ad7fdf..b93cdc6 100644
--- a/examples/tests/uefi_reuse_esp.yaml
+++ b/examples/tests/uefi_reuse_esp.yaml
@@ -67,7 +67,7 @@ storage:
   - device: id_disk0
     id: id_disk0_part2
     number: 2
-    size: 3G
+    size: 4G
     type: partition
     preserve: true
   - fstype: fat32
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index fd6c246..13a9bfd 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1930,29 +1930,6 @@ class VMBaseClass(TestCase):
         self.assertIn(kpackage, self.debian_packages)
 
     @skip_if_flag('expected_failure')
-    def test_clear_holders_ran(self):
-        """ Test curtin install runs block-meta/clear-holders. """
-        if not self.has_storage_config():
-            raise SkipTest("This test does not use storage config.")
-
-        install_logfile = 'root/curtin-install.log'
-        self.output_files_exist([install_logfile])
-        install_log = self.load_collect_file(install_logfile)
-
-        # validate block-meta called clear-holders at least once
-        # We match both 'start' and 'finish' strings, so for each
-        # call we'll have 2 matches.
-        clear_holders_re = 'cmd-install/.*cmd-block-meta/clear-holders'
-        events = re.findall(clear_holders_re, install_log)
-        print('Matched clear-holder events:\n%s' % events)
-        self.assertGreaterEqual(len(events), 2)
-
-        # dirty_disks mode runs an early block-meta command which
-        # also runs clear-holders
-        if self.dirty_disks is True:
-            self.assertGreaterEqual(len(events), 4)
-
-    @skip_if_flag('expected_failure')
     def test_kernel_img_conf(self):
         """ Test curtin install kernel-img.conf correctly. """
         if self.target_distro != 'ubuntu':
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index fa755b1..809a1a7 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -7,7 +7,7 @@ class _ReleaseBase(object):
     repo = "maas-daily"
     arch = get_platform_arch()
     target_arch = arch
-    mem = "1024"
+    mem = "2048"
 
 
 class _UbuntuBase(_ReleaseBase):
@@ -72,7 +72,6 @@ class _UbuntuCore20FromFocalBase(_UbuntuCoreUbuntuBase):
     release = "focal"
     # release for target
     target_release = "ubuntu-core-20"
-    mem = "2048"
 
 
 class _Centos66FromXenialBase(_CentosFromUbuntuBase):
@@ -148,7 +147,6 @@ class _XenialEdge(_XenialBase):
 class _BionicBase(_UbuntuBase):
     release = "bionic"
     target_release = "bionic"
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-18.04"
 
@@ -164,7 +162,6 @@ class _DiscoBase(_UbuntuBase):
     release = "disco"
     target_release = "disco"
     # squashfs is over 300MB, need more ram
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-19.04"
 
@@ -172,7 +169,6 @@ class _DiscoBase(_UbuntuBase):
 class _EoanBase(_UbuntuBase):
     release = "eoan"
     target_release = "eoan"
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-19.10"
 
@@ -180,7 +176,6 @@ class _EoanBase(_UbuntuBase):
 class _FocalBase(_UbuntuBase):
     release = "focal"
     target_release = "focal"
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-20.04"
 
@@ -188,7 +183,6 @@ class _FocalBase(_UbuntuBase):
 class _HirsuteBase(_UbuntuBase):
     release = "hirsute"
     target_release = "hirsute"
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-21.04"
 
@@ -196,7 +190,6 @@ class _HirsuteBase(_UbuntuBase):
 class _ImpishBase(_UbuntuBase):
     release = "impish"
     target_release = "impish"
-    mem = "2048"
     if _UbuntuBase.arch == "arm64":
         subarch = "ga-21.10"