curtin-dev team mailing list archive
-
curtin-dev team
-
Mailing list archive
-
Message #02125
[Merge] ~mwhudson/curtin:no-centos6 into curtin:master
Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:no-centos6 into curtin:master.
Commit message:
Remove CentOS 6 tests.
It's EOL, the required images are no longer in the MAAS image streams
and at least one vmtest fails if you manage to run it somehow.
Requested reviews:
curtin developers (curtin-dev)
For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/415929
--
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:no-centos6 into curtin:master.
diff --git a/examples/tests/centos6_basic.yaml b/examples/tests/centos6_basic.yaml
deleted file mode 100644
index 90fc584..0000000
--- a/examples/tests/centos6_basic.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-showtrace: true
-storage:
- version: 1
- config:
- - id: sda
- type: disk
- ptable: msdos
- model: QEMU HARDDISK
- serial: disk-a
- name: main_disk_with_in/\&valid@#dname
- wipe: superblock
- grub_device: true
- - id: sda1
- type: partition
- number: 1
- size: 3GB
- device: sda
- flag: boot
- - id: sda2
- type: partition
- number: 2
- size: 1GB
- device: sda
- - id: sda3
- type: partition
- number: 3
- size: 1GB
- device: sda
- name: swap
- - id: sda1_root
- type: format
- fstype: ext3
- volume: sda1
- label: 'cloudimg-rootfs'
- - id: sda2_home
- type: format
- fstype: ext4
- volume: sda2
- - id: sda3_swap
- type: format
- fstype: swap
- volume: sda3
- - id: sda1_mount
- type: mount
- path: /
- device: sda1_root
- - id: sda2_mount
- type: mount
- path: /home
- device: sda2_home
- - id: sparedisk_id
- type: disk
- serial: disk-b
- name: sparedisk
- wipe: superblock
- - id: sparedisk_fat_fmt_id
- type: format
- fstype: fat32
- volume: sparedisk_id
- - id: btrfs_disk_id
- type: disk
- serial: disk-c
- name: btrfs_volume
- wipe: superblock
- - id: btrfs_disk_fmt_id
- type: format
- fstype: btrfs
- volume: btrfs_disk_id
- - id: btrfs_disk_mnt_id
- type: mount
- path: /btrfs
- options: 'defaults,noatime'
- device: btrfs_disk_fmt_id
- - id: pnum_disk
- type: disk
- serial: disk-d
- name: pnum_disk
- wipe: superblock
- ptable: gpt
- - id: pnum_disk_p1
- type: partition
- number: 1
- size: 1GB
- device: pnum_disk
- - id: pnum_disk_p2
- type: partition
- number: 2
- size: 8MB
- device: pnum_disk
- flag: prep
- wipe: zero
- name: prep
- - id: pnum_disk_p3
- type: partition
- number: 10
- size: 1GB
- device: pnum_disk
- - id: swap_mnt
- type: mount
- path: "none"
- device: sda3_swap
diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
index fa755b1..0f50d35 100644
--- a/tests/vmtests/releases.py
+++ b/tests/vmtests/releases.py
@@ -75,21 +75,6 @@ class _UbuntuCore20FromFocalBase(_UbuntuCoreUbuntuBase):
mem = "2048"
-class _Centos66FromXenialBase(_CentosFromUbuntuBase):
- release = "xenial"
- target_release = "centos66"
-
-
-class _Centos66FromBionicBase(_CentosFromUbuntuBase):
- release = "bionic"
- target_release = "centos66"
-
-
-class _Centos66FromFocalBase(_CentosFromUbuntuBase):
- release = "focal"
- target_release = "centos66"
-
-
class _PreciseBase(_UbuntuBase):
release = "xenial"
target_release = "precise"
@@ -225,11 +210,8 @@ class _Releases(object):
class _CentosReleases(object):
centos70_xenial = _Centos70FromXenialBase
- centos66_xenial = _Centos66FromXenialBase
centos70_bionic = _Centos70FromBionicBase
- centos66_bionic = _Centos66FromBionicBase
centos70_focal = _Centos70FromFocalBase
- centos66_focal = _Centos66FromFocalBase
class _UbuntuCoreReleases(object):
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 6059bd9..616d635 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -41,10 +41,6 @@ class TestBasicAbs(VMBaseClass):
f="btrfs_uuid_diskc"
if command -v btrfs-debug-tree >/dev/null; then
btrfs-debug-tree -r $dev | awk '/^uuid/ {print $2}' | grep "-"
- # btrfs-debug-tree fails in centos66, use btrfs-show instead
- if [ "$?" != "0" ]; then
- btrfs-show $dev | awk '/uuid/ {print $4}'
- fi
else
btrfs inspect-internal dump-super $dev |
awk '/^dev_item.fsid/ {print $2}'
@@ -61,9 +57,6 @@ class TestBasicAbs(VMBaseClass):
""")]
def _test_ptable(self, blkid_output, expected):
- if self.target_release == "centos66":
- raise SkipTest("No PTTYPE blkid output on Centos66")
-
if not blkid_output:
raise RuntimeError('_test_ptable requires blkid output file')
@@ -100,8 +93,6 @@ class TestBasicAbs(VMBaseClass):
self.assertEqual(kname_uuid, btrfs_uuid)
def _test_partition_is_prep(self, info_file):
- if self.target_release == "centos66":
- raise SkipTest("Cannot detect PReP partitions in Centos66")
udev_info = self.load_collect_file(info_file).rstrip()
if not udev_info:
raise ValueError('Empty udev_info collect file')
@@ -132,10 +123,7 @@ class TestBasicAbs(VMBaseClass):
def test_partition_numbers(self):
# pnum_disk should have partitions 1 2, and 10
- if self.target_release != 'centos66':
- disk = self._dname_to_kname('pnum_disk')
- else:
- disk = self._serial_to_kname('disk-d')
+ disk = self._dname_to_kname('pnum_disk')
expected = [disk + s for s in ["", "1", "2", "10"]]
self._test_partition_numbers(disk, expected)
@@ -220,19 +208,6 @@ class Centos70FocalTestBasic(centos_relbase.centos70_focal,
__test__ = True
-class Centos66XenialTestBasic(centos_relbase.centos66_xenial,
- CentosTestBasicAbs):
- __test__ = True
-
-
-class Centos66BionicTestBasic(centos_relbase.centos66_bionic,
- CentosTestBasicAbs):
- # Centos66 cannot handle ext4 defaults in Bionic (64bit,meta_csum)
- # this conf defaults to ext3
- conf_file = "examples/tests/centos6_basic.yaml"
- __test__ = True
-
-
class XenialGAi386TestBasic(relbase.xenial_ga, TestBasicAbs):
__test__ = True
arch_skip = ["arm64", "ppc64el", "s390x"]
diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
index 1b42493..6ff3a16 100644
--- a/tests/vmtests/test_network.py
+++ b/tests/vmtests/test_network.py
@@ -486,11 +486,6 @@ class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
__test__ = True
-class Centos66TestNetworkBasic(centos_relbase.centos66_xenial,
- CentosTestNetworkBasicAbs):
- __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 8b58edd..dd6ba02 100644
--- a/tests/vmtests/test_network_alias.py
+++ b/tests/vmtests/test_network_alias.py
@@ -34,11 +34,6 @@ class CentosTestNetworkAliasAbs(TestNetworkAliasAbs):
pass
-class Centos66TestNetworkAlias(centos_relbase.centos66_xenial,
- CentosTestNetworkAliasAbs):
- __test__ = True
-
-
class Centos70TestNetworkAlias(centos_relbase.centos70_xenial,
CentosTestNetworkAliasAbs):
__test__ = True
diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
index 73bcf60..ad0c1d4 100644
--- a/tests/vmtests/test_network_bonding.py
+++ b/tests/vmtests/test_network_bonding.py
@@ -69,11 +69,6 @@ class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
__test__ = True
-class Centos66TestNetworkBonding(centos_relbase.centos66_xenial,
- CentosTestNetworkBondingAbs):
- __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 93ecc4b..9c90702 100644
--- a/tests/vmtests/test_network_bridging.py
+++ b/tests/vmtests/test_network_bridging.py
@@ -41,8 +41,6 @@ default_bridge_params_uncheckable = [
# attrs we cannot validate
release_to_bridge_params_uncheckable = {
- 'centos66': ['bridge_fd', 'bridge_hello', 'bridge_hw', 'bridge_maxage',
- 'bridge_pathcost', 'bridge_portprio'],
'centos70': ['bridge_fd', 'bridge_hello', 'bridge_hw', 'bridge_maxage',
'bridge_pathcost', 'bridge_portprio'],
'xenial': ['bridge_ageing'],
@@ -220,11 +218,6 @@ class CentosTestBridgeNetworkAbs(TestBridgeNetworkAbs):
self.assertTrue('bridge' in status)
-class Centos66TestBridgeNetwork(centos_relbase.centos66_xenial,
- CentosTestBridgeNetworkAbs):
- __test__ = True
-
-
class Centos70TestBridgeNetwork(centos_relbase.centos70_xenial,
CentosTestBridgeNetworkAbs):
__test__ = True
diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
index 80b8ccf..f524e82 100644
--- a/tests/vmtests/test_network_ipv6.py
+++ b/tests/vmtests/test_network_ipv6.py
@@ -65,11 +65,6 @@ class ImpishTestNetworkIPV6(relbase.impish, TestNetworkIPV6Abs):
__test__ = True
-class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
- CentosTestNetworkIPV6Abs):
- __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 f24aab5..cb9caad 100644
--- a/tests/vmtests/test_network_ipv6_static.py
+++ b/tests/vmtests/test_network_ipv6_static.py
@@ -35,11 +35,6 @@ class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
__test__ = True
-class Centos66TestNetworkIPV6Static(centos_relbase.centos66_xenial,
- CentosTestNetworkIPV6StaticAbs):
- __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 a6eae41..7955101 100644
--- a/tests/vmtests/test_network_ipv6_vlan.py
+++ b/tests/vmtests/test_network_ipv6_vlan.py
@@ -34,11 +34,6 @@ class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
__test__ = True
-class Centos66TestNetworkIPV6Vlan(centos_relbase.centos66_xenial,
- CentosTestNetworkIPV6VlanAbs):
- __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 a36a752..f112b1c 100644
--- a/tests/vmtests/test_network_mtu.py
+++ b/tests/vmtests/test_network_mtu.py
@@ -201,11 +201,6 @@ class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
__test__ = True
-class Centos66TestNetworkMtu(centos_relbase.centos66_xenial,
- CentosTestNetworkMtuAbs):
- __test__ = True
-
-
class Centos70TestNetworkMtu(centos_relbase.centos70_xenial,
CentosTestNetworkMtuAbs):
__test__ = True
diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
index 95960af..867cf11 100644
--- a/tests/vmtests/test_network_static.py
+++ b/tests/vmtests/test_network_static.py
@@ -40,11 +40,6 @@ class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
__test__ = True
-class Centos66TestNetworkStatic(centos_relbase.centos66_xenial,
- CentosTestNetworkStaticAbs):
- __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 eb096ee..664c035 100644
--- a/tests/vmtests/test_network_static_routes.py
+++ b/tests/vmtests/test_network_static_routes.py
@@ -43,11 +43,6 @@ class ImpishTestNetworkStaticRoutes(relbase.impish,
__test__ = True
-class Centos66TestNetworkStaticRoutes(centos_relbase.centos66_xenial,
- CentosTestNetworkStaticRoutesAbs):
- __test__ = False
-
-
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 38bc87c..99bad66 100644
--- a/tests/vmtests/test_network_vlan.py
+++ b/tests/vmtests/test_network_vlan.py
@@ -88,11 +88,6 @@ class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
__test__ = True
-class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
- CentosTestNetworkVlanAbs):
- __test__ = True
-
-
class Centos70TestNetworkVlan(centos_relbase.centos70_xenial,
CentosTestNetworkVlanAbs):
__test__ = True
diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
index 0ee87fc..2b91f0b 100644
--- a/tests/vmtests/test_simple.py
+++ b/tests/vmtests/test_simple.py
@@ -29,15 +29,6 @@ class Centos70BionicTestSimple(centos_relbase.centos70_bionic, TestSimple):
__test__ = True
-class Centos66XenialTestSimple(centos_relbase.centos66_xenial, TestSimple):
- __test__ = True
-
-
-class Centos66BionicTestSimple(centos_relbase.centos66_bionic, TestSimple):
- __test__ = False
- # LP: #1775424 Centos66 fails with Bionic Ephemeral ext4 features
-
-
class XenialTestSimple(relbase.xenial, TestSimple):
__test__ = True
Follow ups
