Merge ~mwhudson/curtin:skip-test_correct_ptype-bionic into curtin:master

[Michael Hudson-Doyle]

skip BionicTestPartitionExistingRAID.test_correct_ptype

The collect script fails on Bionic because lsblk -o PTTYPE does not work
there, so just skip the test there. This was the only failing vmtest
overnight!!

[Dan Bungert (dbungert)]

This is fine, or if we don't expect to ever fix this, the test could be dropped.

review: Approve

[Server Team CI bot (server-team-bot)]

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

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

review: Approve (continuous-integration)

diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py
index 4bb977e..04c16b7 100644
--- a/tests/vmtests/test_preserve_raid.py
+++ b/tests/vmtests/test_preserve_raid.py
@@ -56,6 +56,9 @@ class BionicTestPartitionExistingRAID(
         relbase.bionic, TestPartitionExistingRAID):
     __test__ = True
 
+    def test_correct_ptype(self):
+        self.skipTest("lsblk on bionic does not support PTTYPE")
+
 
 class FocalTestPartitionExistingRAID(
         relbase.focal, TestPartitionExistingRAID):