diff options
| author | Chad Smith <[email protected]> | 2023-05-26 13:29:26 -0600 |
|---|---|---|
| committer | Dan Bungert <[email protected]> | 2023-09-20 07:04:38 -0600 |
| commit | 91f147b0f0a795b32fbf9799a02ea5daee269b6b (patch) | |
| tree | 69c30f3e21a639a20ccd1002181e5a1a10c997bd | |
| parent | 2a45c8990d299dedeb0b727280f97a2460a1fb28 (diff) | |
vmtests: add jammy after focal
(cherry picked from commit 7c7c29b008128ee5476cfa82b24762c18a0d2fcc)
50 files changed, 325 insertions, 0 deletions
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py index 8cc6a180..56e5e8cf 100644 --- a/tests/vmtests/releases.py +++ b/tests/vmtests/releases.py @@ -165,6 +165,13 @@ class _FocalBase(_UbuntuBase): subarch = "ga-20.04" +class _JammyBase(_UbuntuBase): + release = "jammy" + target_release = "jammy" + if _UbuntuBase.arch == "arm64": + subarch = "ga-22.04" + + class _Releases(object): trusty = _TrustyBase precise = _PreciseBase @@ -183,6 +190,7 @@ class _Releases(object): disco = _DiscoBase eoan = _EoanBase focal = _FocalBase + jammy = _JammyBase class _CentosReleases(object): diff --git a/tests/vmtests/test_apt_config_cmd.py b/tests/vmtests/test_apt_config_cmd.py index fa7666ac..a8479107 100644 --- a/tests/vmtests/test_apt_config_cmd.py +++ b/tests/vmtests/test_apt_config_cmd.py @@ -68,4 +68,8 @@ class FocalTestAptConfigCMDCMD(relbase.focal, TestAptConfigCMD): __test__ = True +class JammyTestAptConfigCMDCMD(relbase.jammy, TestAptConfigCMD): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py index 3755a0c5..f626f2ee 100644 --- a/tests/vmtests/test_basic.py +++ b/tests/vmtests/test_basic.py @@ -234,6 +234,10 @@ class FocalTestBasic(relbase.focal, TestBasicAbs): __test__ = True +class JammyTestBasic(relbase.jammy, TestBasicAbs): + __test__ = True + + class TestBasicScsiAbs(TestBasicAbs): arch_skip = [ 'arm64', # arm64 is UEFI only @@ -350,4 +354,8 @@ class FocalTestScsiBasic(relbase.focal, TestBasicScsiAbs): __test__ = True +class JammyTestScsiBasic(relbase.jammy, TestBasicScsiAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_basic_dasd.py b/tests/vmtests/test_basic_dasd.py index 8cb4c67c..154f26db 100644 --- a/tests/vmtests/test_basic_dasd.py +++ b/tests/vmtests/test_basic_dasd.py @@ -56,4 +56,8 @@ class FocalTestBasicDasd(relbase.focal, TestBasicDasd): __test__ = True +class JammyTestBasicDasd(relbase.jammy, TestBasicDasd): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_bcache_basic.py b/tests/vmtests/test_bcache_basic.py index 7a47ace3..2e62f0b0 100644 --- a/tests/vmtests/test_bcache_basic.py +++ b/tests/vmtests/test_bcache_basic.py @@ -68,4 +68,8 @@ class FocalBcacheBasic(relbase.focal, TestBcacheBasic): __test__ = True +class JammyBcacheBasic(relbase.jammy, TestBcacheBasic): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_bcache_bug1718699.py b/tests/vmtests/test_bcache_bug1718699.py index b0003e61..82a765af 100644 --- a/tests/vmtests/test_bcache_bug1718699.py +++ b/tests/vmtests/test_bcache_bug1718699.py @@ -23,4 +23,8 @@ class FocalTestBcacheBug1718699(relbase.focal, TestBcacheBug1718699): __test__ = True +class JammyTestBcacheBug1718699(relbase.jammy, TestBcacheBug1718699): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_bcache_ceph.py b/tests/vmtests/test_bcache_ceph.py index cb41fdae..15cce590 100644 --- a/tests/vmtests/test_bcache_ceph.py +++ b/tests/vmtests/test_bcache_ceph.py @@ -79,6 +79,10 @@ class FocalTestBcacheCeph(relbase.focal, TestBcacheCeph): __test__ = True +class JammyTestBcacheCeph(relbase.jammy, TestBcacheCeph): + __test__ = True + + class TestBcacheCephLvm(TestBcacheCeph): test_type = 'storage' nr_cpus = 2 @@ -105,4 +109,8 @@ class FocalTestBcacheCephLvm(relbase.focal, TestBcacheCephLvm): __test__ = True +class JammyTestBcacheCephLvm(relbase.jammy, TestBcacheCephLvm): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_bcache_partitions.py b/tests/vmtests/test_bcache_partitions.py index 9d05ee88..c3c41bc8 100644 --- a/tests/vmtests/test_bcache_partitions.py +++ b/tests/vmtests/test_bcache_partitions.py @@ -29,4 +29,8 @@ class FocalTestBcachePartitions(relbase.focal, TestBcachePartitions): __test__ = True +class JammyTestBcachePartitions(relbase.jammy, TestBcachePartitions): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_fs_battery.py b/tests/vmtests/test_fs_battery.py index d50fda0a..75084b0d 100644 --- a/tests/vmtests/test_fs_battery.py +++ b/tests/vmtests/test_fs_battery.py @@ -243,4 +243,8 @@ class FocalTestFsBattery(relbase.focal, TestFsBattery): __test__ = True +class JammyTestFsBattery(relbase.jammy, TestFsBattery): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_iscsi.py b/tests/vmtests/test_iscsi.py index 8d1d3f5f..6ad343df 100644 --- a/tests/vmtests/test_iscsi.py +++ b/tests/vmtests/test_iscsi.py @@ -76,4 +76,8 @@ class FocalTestIscsiBasic(relbase.focal, TestBasicIscsiAbs): __test__ = True +class JammyTestIscsiBasic(relbase.jammy, TestBasicIscsiAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_journald_reporter.py b/tests/vmtests/test_journald_reporter.py index f0d068fc..ba39af25 100644 --- a/tests/vmtests/test_journald_reporter.py +++ b/tests/vmtests/test_journald_reporter.py @@ -36,4 +36,8 @@ class FocalTestJournaldReporter(relbase.focal, TestJournaldReporter): __test__ = True +class JammyTestJournaldReporter(relbase.jammy, TestJournaldReporter): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_lvm.py b/tests/vmtests/test_lvm.py index ff39d6c8..e15838ea 100644 --- a/tests/vmtests/test_lvm.py +++ b/tests/vmtests/test_lvm.py @@ -81,4 +81,8 @@ class FocalTestLvm(relbase.focal, TestLvmAbs): __test__ = True +class JammyTestLvm(relbase.jammy, TestLvmAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_lvm_iscsi.py b/tests/vmtests/test_lvm_iscsi.py index eb8c92aa..94e523bb 100644 --- a/tests/vmtests/test_lvm_iscsi.py +++ b/tests/vmtests/test_lvm_iscsi.py @@ -99,4 +99,8 @@ class FocalTestIscsiLvm(relbase.focal, TestLvmIscsiAbs): __test__ = True +class JammyTestIscsiLvm(relbase.jammy, TestLvmIscsiAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_lvm_raid.py b/tests/vmtests/test_lvm_raid.py index bc503106..b265318a 100644 --- a/tests/vmtests/test_lvm_raid.py +++ b/tests/vmtests/test_lvm_raid.py @@ -59,3 +59,8 @@ class FocalTestLvmOverRaid(relbase.focal, TestLvmOverRaidAbs): __test__ = True +class JammyTestLvmOverRaid(relbase.jammy, TestLvmOverRaidAbs): + __test__ = True + + +# vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_lvm_root.py b/tests/vmtests/test_lvm_root.py index 43c2d952..6464f223 100644 --- a/tests/vmtests/test_lvm_root.py +++ b/tests/vmtests/test_lvm_root.py @@ -94,6 +94,13 @@ class FocalTestLvmRootExt4(relbase.focal, TestLvmRootAbs): } +class JammyTestLvmRootExt4(relbase.jammy, TestLvmRootAbs): + __test__ = True + conf_replace = { + '__ROOTFS_FORMAT__': 'ext4', + } + + class XenialTestLvmRootXfs(relbase.xenial, TestLvmRootAbs): __test__ = True conf_replace = { @@ -140,6 +147,14 @@ class FocalTestUefiLvmRootExt4(relbase.focal, TestUefiLvmRootAbs): } +class JammyTestUefiLvmRootExt4(relbase.jammy, TestUefiLvmRootAbs): + __test__ = True + conf_replace = { + '__BOOTFS_FORMAT__': 'ext4', + '__ROOTFS_FORMAT__': 'ext4', + } + + class XenialTestUefiLvmRootXfs(relbase.xenial, TestUefiLvmRootAbs): __test__ = True conf_replace = { diff --git a/tests/vmtests/test_mdadm_bcache.py b/tests/vmtests/test_mdadm_bcache.py index cd6851a9..54b35887 100644 --- a/tests/vmtests/test_mdadm_bcache.py +++ b/tests/vmtests/test_mdadm_bcache.py @@ -158,6 +158,10 @@ class FocalTestMdadmBcache(relbase.focal, TestMdadmBcacheAbs): __test__ = True +class JammyTestMdadmBcache(relbase.jammy, TestMdadmBcacheAbs): + __test__ = True + + class TestMirrorbootAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/mirrorboot.yaml" @@ -199,6 +203,10 @@ class FocalTestMirrorboot(relbase.focal, TestMirrorbootAbs): __test__ = True +class JammyTestMirrorboot(relbase.jammy, TestMirrorbootAbs): + __test__ = True + + class TestMirrorbootPartitionsAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/mirrorboot-msdos-partition.yaml" @@ -244,6 +252,11 @@ class FocalTestMirrorbootPartitions(relbase.focal, __test__ = True +class JammyTestMirrorbootPartitions(relbase.jammy, + TestMirrorbootPartitionsAbs): + __test__ = True + + class TestMirrorbootPartitionsUEFIAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/mirrorboot-uefi.yaml" @@ -334,6 +347,11 @@ class FocalTestMirrorbootPartitionsUEFI(relbase.focal, __test__ = True +class JammyTestMirrorbootPartitionsUEFI(relbase.jammy, + TestMirrorbootPartitionsUEFIAbs): + __test__ = True + + class TestRaid5bootAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/raid5boot.yaml" @@ -378,6 +396,10 @@ class FocalTestRaid5boot(relbase.focal, TestRaid5bootAbs): __test__ = True +class JammyTestRaid5boot(relbase.jammy, TestRaid5bootAbs): + __test__ = True + + class TestRaid6bootAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/raid6boot.yaml" @@ -435,6 +457,10 @@ class FocalTestRaid6boot(relbase.focal, TestRaid6bootAbs): __test__ = True +class JammyTestRaid6boot(relbase.jammy, TestRaid6bootAbs): + __test__ = True + + class TestRaid10bootAbs(TestMdadmAbs): # alternative config for more complex setup conf_file = "examples/tests/raid10boot.yaml" @@ -478,6 +504,10 @@ class FocalTestRaid10boot(relbase.focal, TestRaid10bootAbs): __test__ = True +class JammyTestRaid10boot(relbase.jammy, TestRaid10bootAbs): + __test__ = True + + class TestAllindataAbs(TestMdadmAbs): # more complex, needs more time # alternative config for more complex setup @@ -578,4 +608,8 @@ class FocalTestAllindata(relbase.focal, TestAllindataAbs): __test__ = True +class JammyTestAllindata(relbase.jammy, TestAllindataAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_mdadm_iscsi.py b/tests/vmtests/test_mdadm_iscsi.py index 4f35178e..128712c4 100644 --- a/tests/vmtests/test_mdadm_iscsi.py +++ b/tests/vmtests/test_mdadm_iscsi.py @@ -54,4 +54,8 @@ class FocalTestIscsiMdadm(relbase.focal, TestMdadmIscsiAbs): __test__ = True +class JammyTestIscsiMdadm(relbase.jammy, TestMdadmIscsiAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_multipath.py b/tests/vmtests/test_multipath.py index 1f69b4b1..0067737c 100644 --- a/tests/vmtests/test_multipath.py +++ b/tests/vmtests/test_multipath.py @@ -162,6 +162,10 @@ class FocalTestMultipathBasic(relbase.focal, TestMultipathBasicAbs): __test__ = True +class JammyTestMultipathBasic(relbase.jammy, TestMultipathBasicAbs): + __test__ = True + + class TestMultipathReuseAbs(TestMultipathBasicAbs): conf_file = "examples/tests/multipath-reuse.yaml" @@ -170,4 +174,8 @@ class FocalTestMultipathReuse(relbase.focal, TestMultipathReuseAbs): __test__ = True +class JammyTestMultipathReuse(relbase.jammy, TestMultipathReuseAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_multipath_lvm.py b/tests/vmtests/test_multipath_lvm.py index ff7964c7..aaeefd5f 100644 --- a/tests/vmtests/test_multipath_lvm.py +++ b/tests/vmtests/test_multipath_lvm.py @@ -60,6 +60,10 @@ class FocalTestMultipathLvm(relbase.focal, TestMultipathLvmAbs): __test__ = True +class JammyTestMultipathLvm(relbase.jammy, TestMultipathLvmAbs): + __test__ = True + + class TestMultipathLvmPartWipeAbs(TestMultipathLvmAbs): conf_file = "examples/tests/multipath-lvm-part-wipe.yaml" @@ -69,4 +73,9 @@ class FocalTestMultipathLvmPartWipe(relbase.focal, __test__ = True +class JammyTestMultipathLvmPartWipe(relbase.jammy, + TestMultipathLvmPartWipeAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py index 8d2f2541..4b16aebf 100644 --- a/tests/vmtests/test_network.py +++ b/tests/vmtests/test_network.py @@ -478,6 +478,10 @@ class FocalTestNetworkBasic(relbase.focal, TestNetworkBasicAbs): __test__ = True +class JammyTestNetworkBasic(relbase.jammy, TestNetworkBasicAbs): + __test__ = True + + class Centos70TestNetworkBasic(centos_relbase.centos70_xenial, CentosTestNetworkBasicAbs): __test__ = True diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py index 88ff9769..628a8b7c 100644 --- a/tests/vmtests/test_network_alias.py +++ b/tests/vmtests/test_network_alias.py @@ -51,4 +51,8 @@ class FocalTestNetworkAlias(relbase.focal, TestNetworkAliasAbs): __test__ = True +class JammyTestNetworkAlias(relbase.jammy, TestNetworkAliasAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py index d3470102..ea411d8c 100644 --- a/tests/vmtests/test_network_bonding.py +++ b/tests/vmtests/test_network_bonding.py @@ -61,6 +61,10 @@ class FocalTestBonding(relbase.focal, TestNetworkBondingAbs): __test__ = True +class JammyTestBonding(relbase.jammy, TestNetworkBondingAbs): + __test__ = True + + class Centos70TestNetworkBonding(centos_relbase.centos70_xenial, CentosTestNetworkBondingAbs): __test__ = True diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py index 34cf7803..c8c52b34 100644 --- a/tests/vmtests/test_network_bridging.py +++ b/tests/vmtests/test_network_bridging.py @@ -233,6 +233,10 @@ class FocalTestBridging(relbase.focal, TestBridgeNetworkAbs): __test__ = True +class JammyTestBridging(relbase.jammy, TestBridgeNetworkAbs): + __test__ = True + + class XenialTestBridgingV2(relbase.xenial, TestBridgeNetworkAbs): """ This class only needs to verify that when provided a v2 config that the Xenial network packages are installed. """ diff --git a/tests/vmtests/test_network_disabled.py b/tests/vmtests/test_network_disabled.py index 3e8b48fd..b4f9eb7b 100644 --- a/tests/vmtests/test_network_disabled.py +++ b/tests/vmtests/test_network_disabled.py @@ -71,4 +71,16 @@ class FocalCurtinDisableCloudInitNetworkingVersion1(relbase.focal, TestKlass3): __test__ = True +class JammyCurtinDisableNetworkRendering(relbase.jammy, TestKlass1): + __test__ = True + + +class JammyCurtinDisableCloudInitNetworking(relbase.jammy, TestKlass2): + __test__ = True + + +class JammyCurtinDisableCloudInitNetworkingVersion1(relbase.jammy, TestKlass3): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py index bd9a055a..5c31b483 100644 --- a/tests/vmtests/test_network_ipv6.py +++ b/tests/vmtests/test_network_ipv6.py @@ -57,6 +57,10 @@ class FocalTestNetworkIPV6(relbase.focal, TestNetworkIPV6Abs): __test__ = True +class JammyTestNetworkIPV6(relbase.jammy, TestNetworkIPV6Abs): + __test__ = True + + class Centos70TestNetworkIPV6(centos_relbase.centos70_xenial, CentosTestNetworkIPV6Abs): __test__ = True diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py index 3b779255..5352bfef 100644 --- a/tests/vmtests/test_network_ipv6_static.py +++ b/tests/vmtests/test_network_ipv6_static.py @@ -27,6 +27,10 @@ class FocalTestNetworkIPV6Static(relbase.focal, TestNetworkIPV6StaticAbs): __test__ = True +class JammyTestNetworkIPV6Static(relbase.jammy, TestNetworkIPV6StaticAbs): + __test__ = True + + class Centos70TestNetworkIPV6Static(centos_relbase.centos70_xenial, CentosTestNetworkIPV6StaticAbs): __test__ = True diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py index 0a595152..8f3fe64c 100644 --- a/tests/vmtests/test_network_ipv6_vlan.py +++ b/tests/vmtests/test_network_ipv6_vlan.py @@ -26,6 +26,10 @@ class FocalTestNetworkIPV6Vlan(relbase.focal, TestNetworkIPV6VlanAbs): __test__ = True +class JammyTestNetworkIPV6Vlan(relbase.jammy, TestNetworkIPV6VlanAbs): + __test__ = True + + class Centos70TestNetworkIPV6Vlan(centos_relbase.centos70_xenial, CentosTestNetworkIPV6VlanAbs): __test__ = True diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py index 594e2418..67d5d014 100644 --- a/tests/vmtests/test_network_mtu.py +++ b/tests/vmtests/test_network_mtu.py @@ -193,6 +193,10 @@ class FocalTestNetworkMtu(relbase.focal, TestNetworkMtuNetworkdAbs): __test__ = True +class JammyTestNetworkMtu(relbase.jammy, TestNetworkMtuNetworkdAbs): + __test__ = True + + class Centos70TestNetworkMtu(centos_relbase.centos70_xenial, CentosTestNetworkMtuAbs): __test__ = True diff --git a/tests/vmtests/test_network_ovs.py b/tests/vmtests/test_network_ovs.py index c65db4ec..e168a0d5 100644 --- a/tests/vmtests/test_network_ovs.py +++ b/tests/vmtests/test_network_ovs.py @@ -38,4 +38,8 @@ class FocalTestNetworkOvs(relbase.focal, TestNetworkOvsAbs): __test__ = True +class JammyTestNetworkOvs(relbase.jammy, TestNetworkOvsAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py index 471796e5..620c9529 100644 --- a/tests/vmtests/test_network_static.py +++ b/tests/vmtests/test_network_static.py @@ -32,6 +32,10 @@ class FocalTestNetworkStatic(relbase.focal, TestNetworkStaticAbs): __test__ = True +class JammyTestNetworkStatic(relbase.jammy, TestNetworkStaticAbs): + __test__ = True + + class Centos70TestNetworkStatic(centos_relbase.centos70_xenial, CentosTestNetworkStaticAbs): __test__ = True diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py index b962ded3..0258113a 100644 --- a/tests/vmtests/test_network_static_routes.py +++ b/tests/vmtests/test_network_static_routes.py @@ -33,6 +33,11 @@ class FocalTestNetworkStaticRoutes(relbase.focal, __test__ = True +class JammyTestNetworkStaticRoutes(relbase.jammy, + TestNetworkStaticRoutesAbs): + __test__ = True + + class Centos70TestNetworkStaticRoutes(centos_relbase.centos70_xenial, CentosTestNetworkStaticRoutesAbs): __test__ = False diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py index 2f6dab04..0ab62bb4 100644 --- a/tests/vmtests/test_network_vlan.py +++ b/tests/vmtests/test_network_vlan.py @@ -80,6 +80,10 @@ class FocalTestNetworkVlan(relbase.focal, TestNetworkVlanAbs): __test__ = True +class JammyTestNetworkVlan(relbase.jammy, TestNetworkVlanAbs): + __test__ = True + + class Centos70TestNetworkVlan(centos_relbase.centos70_xenial, CentosTestNetworkVlanAbs): __test__ = True diff --git a/tests/vmtests/test_nvme.py b/tests/vmtests/test_nvme.py index f598f127..dd071e95 100644 --- a/tests/vmtests/test_nvme.py +++ b/tests/vmtests/test_nvme.py @@ -79,6 +79,12 @@ class FocalTestNvme(relbase.focal, TestNvmeAbs): # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' +class JammyTestNvme(relbase.jammy, TestNvmeAbs): + __test__ = False + # An error occured handling 'nvme_disk2': + # OSError - [Errno 16] Device or resource busy: '/dev/mapper/mpatha' + + class TestNvmeBcacheAbs(TestNvmeAbs): arch_skip = [ "s390x", # nvme is a pci device, no pci on s390x @@ -145,4 +151,8 @@ class FocalTestNvmeBcache(relbase.focal, TestNvmeBcacheAbs): __test__ = True +class JammyTestNvmeBcache(relbase.jammy, TestNvmeBcacheAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_panic.py b/tests/vmtests/test_panic.py index 992e5902..d8d3f222 100644 --- a/tests/vmtests/test_panic.py +++ b/tests/vmtests/test_panic.py @@ -29,4 +29,8 @@ class FocalTestInstallPanic(relbase.focal, TestInstallPanic): __test__ = True +class JammyTestInstallPanic(relbase.jammy, TestInstallPanic): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_pollinate_useragent.py b/tests/vmtests/test_pollinate_useragent.py index ba681f51..5a4b0fbb 100644 --- a/tests/vmtests/test_pollinate_useragent.py +++ b/tests/vmtests/test_pollinate_useragent.py @@ -65,4 +65,8 @@ class FocalTestPollinateUserAgent(relbase.focal, TestPollinateUserAgent): __test__ = True +class JammyTestPollinateUserAgent(relbase.jammy, TestPollinateUserAgent): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_preserve.py b/tests/vmtests/test_preserve.py index 7a447e0b..d6eb9226 100644 --- a/tests/vmtests/test_preserve.py +++ b/tests/vmtests/test_preserve.py @@ -29,4 +29,8 @@ class FocalTestPreserve(relbase.focal, TestPreserve): __test__ = True +class JammyTestPreserve(relbase.jammy, TestPreserve): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_preserve_bcache.py b/tests/vmtests/test_preserve_bcache.py index 20c81b44..2384be82 100644 --- a/tests/vmtests/test_preserve_bcache.py +++ b/tests/vmtests/test_preserve_bcache.py @@ -60,4 +60,8 @@ class FocalTestPreserveBcache(relbase.focal, TestPreserveBcache): __test__ = True +class JammyTestPreserveBcache(relbase.jammy, TestPreserveBcache): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_preserve_lvm.py b/tests/vmtests/test_preserve_lvm.py index 82d07071..1eb954e3 100644 --- a/tests/vmtests/test_preserve_lvm.py +++ b/tests/vmtests/test_preserve_lvm.py @@ -73,4 +73,8 @@ class FocalTestLvmPreserve(relbase.focal, TestLvmPreserveAbs): __test__ = True +class JammyTestLvmPreserve(relbase.jammy, TestLvmPreserveAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_preserve_partition_wipe_vg.py b/tests/vmtests/test_preserve_partition_wipe_vg.py index 5bf48c77..76fa9c30 100644 --- a/tests/vmtests/test_preserve_partition_wipe_vg.py +++ b/tests/vmtests/test_preserve_partition_wipe_vg.py @@ -29,6 +29,10 @@ class FocalTestPreserveWipeLvm(relbase.focal, TestPreserveWipeLvm): __test__ = True +class JammyTestPreserveWipeLvm(relbase.jammy, TestPreserveWipeLvm): + __test__ = True + + class TestPreserveWipeLvmSimple(VMBaseClass): conf_file = "examples/tests/preserve-partition-wipe-vg-simple.yaml" uefi = False @@ -48,4 +52,8 @@ class FocalTestPreserveWipeLvmSimple(relbase.focal, TestPreserveWipeLvmSimple): __test__ = True +class JammyTestPreserveWipeLvmSimple(relbase.jammy, TestPreserveWipeLvmSimple): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_preserve_raid.py b/tests/vmtests/test_preserve_raid.py index e4dc350d..cf97203b 100644 --- a/tests/vmtests/test_preserve_raid.py +++ b/tests/vmtests/test_preserve_raid.py @@ -29,6 +29,10 @@ class FocalTestPreserveRAID(relbase.focal, TestPreserveRAID): __test__ = True +class JammyTestPreserveRAID(relbase.jammy, TestPreserveRAID): + __test__ = True + + class TestPartitionExistingRAID(VMBaseClass): """ Test that curtin can repartition an existing RAID. """ conf_file = "examples/tests/partition-existing-raid.yaml" @@ -57,4 +61,9 @@ class FocalTestPartitionExistingRAID( __test__ = True +class JammyTestPartitionExistingRAID( + relbase.jammy, TestPartitionExistingRAID): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_python_apt.py b/tests/vmtests/test_python_apt.py index a066b28b..ed2e007e 100644 --- a/tests/vmtests/test_python_apt.py +++ b/tests/vmtests/test_python_apt.py @@ -31,4 +31,8 @@ class FocalTestPythonApt(relbase.focal, TestPythonApt): __test__ = True +class JammyTestPythonApt(relbase.jammy, TestPythonApt): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_raid5_bcache.py b/tests/vmtests/test_raid5_bcache.py index 26b490d8..e04120d3 100644 --- a/tests/vmtests/test_raid5_bcache.py +++ b/tests/vmtests/test_raid5_bcache.py @@ -92,4 +92,8 @@ class FocalTestRaid5Bcache(relbase.focal, TestMdadmBcacheAbs): __test__ = True +class JammyTestRaid5Bcache(relbase.jammy, TestMdadmBcacheAbs): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_raid_partition_to_disk.py b/tests/vmtests/test_raid_partition_to_disk.py index 572968f7..fa1939c1 100644 --- a/tests/vmtests/test_raid_partition_to_disk.py +++ b/tests/vmtests/test_raid_partition_to_disk.py @@ -22,4 +22,8 @@ class FocalTestRAIDPartitionToDisk(relbase.focal, TestRAIDPartitionToDisk): __test__ = True +class JammyTestRAIDPartitionToDisk(relbase.jammy, TestRAIDPartitionToDisk): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_reuse_lvm_member.py b/tests/vmtests/test_reuse_lvm_member.py index a78d0ea8..cd7efd6e 100644 --- a/tests/vmtests/test_reuse_lvm_member.py +++ b/tests/vmtests/test_reuse_lvm_member.py @@ -26,4 +26,9 @@ class FocalTestReuseLVMMemberPartition(relbase.focal, __test__ = True +class JammyTestReuseLVMMemberPartition(relbase.jammy, + TestReuseLVMMemberPartition): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_reuse_msdos_partitions.py b/tests/vmtests/test_reuse_msdos_partitions.py index 5b6addc4..1561f3f6 100644 --- a/tests/vmtests/test_reuse_msdos_partitions.py +++ b/tests/vmtests/test_reuse_msdos_partitions.py @@ -23,4 +23,9 @@ class FocalTestReuseMSDOSPartitions(relbase.focal, __test__ = True +class JammyTestReuseMSDOSPartitions(relbase.jammy, + TestReuseMSDOSPartitions): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_reuse_raid_member.py b/tests/vmtests/test_reuse_raid_member.py index e3c464d4..43c71855 100644 --- a/tests/vmtests/test_reuse_raid_member.py +++ b/tests/vmtests/test_reuse_raid_member.py @@ -32,6 +32,10 @@ class FocalTestReuseRAIDMember(relbase.focal, TestReuseRAIDMember): __test__ = True +class JammyTestReuseRAIDMember(relbase.jammy, TestReuseRAIDMember): + __test__ = True + + class BionicTestReuseRAIDMemberPartition(relbase.bionic, TestReuseRAIDMemberPartition): __test__ = True @@ -42,4 +46,9 @@ class FocalTestReuseRAIDMemberPartition(relbase.focal, __test__ = True +class JammyTestReuseRAIDMemberPartition(relbase.jammy, + TestReuseRAIDMemberPartition): + __test__ = True + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_reuse_uefi_esp.py b/tests/vmtests/test_reuse_uefi_esp.py index 2674562b..31165051 100644 --- a/tests/vmtests/test_reuse_uefi_esp.py +++ b/tests/vmtests/test_reuse_uefi_esp.py @@ -41,4 +41,11 @@ class FocalTestUefiReuseEsp(relbase.focal, TestUefiReuseEspAbs): return super().test_efiboot_menu_has_one_distro_entry() +class JammyTestUefiReuseEsp(relbase.jammy, TestUefiReuseEspAbs): + __test__ = True + + def test_efiboot_menu_has_one_distro_entry(self): + return super().test_efiboot_menu_has_one_distro_entry() + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py index ce64cc0c..57010f5c 100644 --- a/tests/vmtests/test_simple.py +++ b/tests/vmtests/test_simple.py @@ -47,6 +47,13 @@ class FocalTestSimple(relbase.focal, TestSimple): self.output_files_exist(["netplan.yaml"]) +class JammyTestSimple(relbase.jammy, TestSimple): + __test__ = True + + def test_output_files_exist(self): + self.output_files_exist(["netplan.yaml"]) + + class TestSimpleStorage(VMBaseClass): """ Test curtin runs clear-holders when mode=simple with storage cfg. """ conf_file = "examples/tests/simple-storage.yaml" @@ -96,6 +103,13 @@ class FocalTestSimpleStorage(relbase.focal, TestSimpleStorage): self.output_files_exist(["netplan.yaml"]) +class JammyTestSimpleStorage(relbase.jammy, TestSimpleStorage): + __test__ = True + + def test_output_files_exist(self): + self.output_files_exist(["netplan.yaml"]) + + class TestGrubNoDefaults(VMBaseClass): """ Test that curtin does not emit any grub configuration files. """ conf_file = "examples/tests/no-grub-file.yaml" @@ -122,4 +136,11 @@ class FocalTestGrubNoDefaults(relbase.focal, TestGrubNoDefaults): self.output_files_exist(["netplan.yaml"]) +class JammyTestGrubNoDefaults(relbase.jammy, TestGrubNoDefaults): + __test__ = True + + def test_output_files_exist(self): + self.output_files_exist(["netplan.yaml"]) + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_uefi_basic.py b/tests/vmtests/test_uefi_basic.py index d29312b4..e962e09d 100644 --- a/tests/vmtests/test_uefi_basic.py +++ b/tests/vmtests/test_uefi_basic.py @@ -100,6 +100,10 @@ class FocalUefiTestBasic(relbase.focal, TestBasicAbs): __test__ = True +class JammyUefiTestBasic(relbase.jammy, TestBasicAbs): + __test__ = True + + class Centos70UefiTestBasic4k(centos_relbase.centos70_xenial, TestBasicAbs): __test__ = True disk_block_size = 4096 @@ -120,4 +124,9 @@ class FocalUefiTestBasic4k(relbase.focal, TestBasicAbs): disk_block_size = 4096 +class JammyUefiTestBasic4k(relbase.jammy, TestBasicAbs): + __test__ = True + disk_block_size = 4096 + + # vi: ts=4 expandtab syntax=python diff --git a/tests/vmtests/test_zfsroot.py b/tests/vmtests/test_zfsroot.py index 70eca559..1ea6ca0d 100644 --- a/tests/vmtests/test_zfsroot.py +++ b/tests/vmtests/test_zfsroot.py @@ -101,6 +101,11 @@ class FocalTestZfsRoot(relbase.focal, TestZfsRootAbs): mem = 4096 +class JammyTestZfsRoot(relbase.jammy, TestZfsRootAbs): + __test__ = True + mem = 4096 + + class TestZfsRootFsTypeAbs(TestZfsRootAbs): conf_file = "examples/tests/basic-zfsroot.yaml" @@ -125,4 +130,9 @@ class FocalTestZfsRootFsType(relbase.focal, TestZfsRootFsTypeAbs): mem = 4096 +class JammyTestZfsRootFsType(relbase.jammy, TestZfsRootFsTypeAbs): + __test__ = True + mem = 4096 + + # vi: ts=4 expandtab syntax=python |