curtin

Merge ~mwhudson/curtin:no-centos6 into curtin:master

  1. Git
  2. lp:~mwhudson/curtin
  3. no-centos6
  4. Merge into master
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: 86273fade5928dde8c3f692d48c75ad15c0f114b
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:no-centos6
Merge into: curtin:master
Diff against target: 415 lines (+1/-211)
15 files modified
dev/null (+0/-101)
tests/vmtests/releases.py (+0/-18)
tests/vmtests/test_basic.py (+1/-26)
tests/vmtests/test_network.py (+0/-5)
tests/vmtests/test_network_alias.py (+0/-5)
tests/vmtests/test_network_bonding.py (+0/-5)
tests/vmtests/test_network_bridging.py (+0/-7)
tests/vmtests/test_network_ipv6.py (+0/-5)
tests/vmtests/test_network_ipv6_static.py (+0/-5)
tests/vmtests/test_network_ipv6_vlan.py (+0/-5)
tests/vmtests/test_network_mtu.py (+0/-5)
tests/vmtests/test_network_static.py (+0/-5)
tests/vmtests/test_network_static_routes.py (+0/-5)
tests/vmtests/test_network_vlan.py (+0/-5)
tests/vmtests/test_simple.py (+0/-9)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+415929@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Dan Bungert (dbungert) :
Revision history for this message
Michael Hudson-Doyle (mwhudson) :
Revision history for this message
Dan Bungert (dbungert) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/centos6_basic.yaml b/examples/tests/centos6_basic.yaml
2deleted file mode 100644
3index 90fc584..0000000
4--- a/examples/tests/centos6_basic.yaml
5+++ /dev/null
6@@ -1,101 +0,0 @@
7-showtrace: true
8-storage:
9- version: 1
10- config:
11- - id: sda
12- type: disk
13- ptable: msdos
14- model: QEMU HARDDISK
15- serial: disk-a
16- name: main_disk_with_in/\&valid@#dname
17- wipe: superblock
18- grub_device: true
19- - id: sda1
20- type: partition
21- number: 1
22- size: 3GB
23- device: sda
24- flag: boot
25- - id: sda2
26- type: partition
27- number: 2
28- size: 1GB
29- device: sda
30- - id: sda3
31- type: partition
32- number: 3
33- size: 1GB
34- device: sda
35- name: swap
36- - id: sda1_root
37- type: format
38- fstype: ext3
39- volume: sda1
40- label: 'cloudimg-rootfs'
41- - id: sda2_home
42- type: format
43- fstype: ext4
44- volume: sda2
45- - id: sda3_swap
46- type: format
47- fstype: swap
48- volume: sda3
49- - id: sda1_mount
50- type: mount
51- path: /
52- device: sda1_root
53- - id: sda2_mount
54- type: mount
55- path: /home
56- device: sda2_home
57- - id: sparedisk_id
58- type: disk
59- serial: disk-b
60- name: sparedisk
61- wipe: superblock
62- - id: sparedisk_fat_fmt_id
63- type: format
64- fstype: fat32
65- volume: sparedisk_id
66- - id: btrfs_disk_id
67- type: disk
68- serial: disk-c
69- name: btrfs_volume
70- wipe: superblock
71- - id: btrfs_disk_fmt_id
72- type: format
73- fstype: btrfs
74- volume: btrfs_disk_id
75- - id: btrfs_disk_mnt_id
76- type: mount
77- path: /btrfs
78- options: 'defaults,noatime'
79- device: btrfs_disk_fmt_id
80- - id: pnum_disk
81- type: disk
82- serial: disk-d
83- name: pnum_disk
84- wipe: superblock
85- ptable: gpt
86- - id: pnum_disk_p1
87- type: partition
88- number: 1
89- size: 1GB
90- device: pnum_disk
91- - id: pnum_disk_p2
92- type: partition
93- number: 2
94- size: 8MB
95- device: pnum_disk
96- flag: prep
97- wipe: zero
98- name: prep
99- - id: pnum_disk_p3
100- type: partition
101- number: 10
102- size: 1GB
103- device: pnum_disk
104- - id: swap_mnt
105- type: mount
106- path: "none"
107- device: sda3_swap
108diff --git a/tests/vmtests/releases.py b/tests/vmtests/releases.py
109index fa755b1..0f50d35 100644
110--- a/tests/vmtests/releases.py
111+++ b/tests/vmtests/releases.py
112@@ -75,21 +75,6 @@ class _UbuntuCore20FromFocalBase(_UbuntuCoreUbuntuBase):
113 mem = "2048"
114
115
116-class _Centos66FromXenialBase(_CentosFromUbuntuBase):
117- release = "xenial"
118- target_release = "centos66"
119-
120-
121-class _Centos66FromBionicBase(_CentosFromUbuntuBase):
122- release = "bionic"
123- target_release = "centos66"
124-
125-
126-class _Centos66FromFocalBase(_CentosFromUbuntuBase):
127- release = "focal"
128- target_release = "centos66"
129-
130-
131 class _PreciseBase(_UbuntuBase):
132 release = "xenial"
133 target_release = "precise"
134@@ -225,11 +210,8 @@ class _Releases(object):
135
136 class _CentosReleases(object):
137 centos70_xenial = _Centos70FromXenialBase
138- centos66_xenial = _Centos66FromXenialBase
139 centos70_bionic = _Centos70FromBionicBase
140- centos66_bionic = _Centos66FromBionicBase
141 centos70_focal = _Centos70FromFocalBase
142- centos66_focal = _Centos66FromFocalBase
143
144
145 class _UbuntuCoreReleases(object):
146diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
147index 6059bd9..616d635 100644
148--- a/tests/vmtests/test_basic.py
149+++ b/tests/vmtests/test_basic.py
150@@ -41,10 +41,6 @@ class TestBasicAbs(VMBaseClass):
151 f="btrfs_uuid_diskc"
152 if command -v btrfs-debug-tree >/dev/null; then
153 btrfs-debug-tree -r $dev | awk '/^uuid/ {print $2}' | grep "-"
154- # btrfs-debug-tree fails in centos66, use btrfs-show instead
155- if [ "$?" != "0" ]; then
156- btrfs-show $dev | awk '/uuid/ {print $4}'
157- fi
158 else
159 btrfs inspect-internal dump-super $dev |
160 awk '/^dev_item.fsid/ {print $2}'
161@@ -61,9 +57,6 @@ class TestBasicAbs(VMBaseClass):
162 """)]
163
164 def _test_ptable(self, blkid_output, expected):
165- if self.target_release == "centos66":
166- raise SkipTest("No PTTYPE blkid output on Centos66")
167-
168 if not blkid_output:
169 raise RuntimeError('_test_ptable requires blkid output file')
170
171@@ -100,8 +93,6 @@ class TestBasicAbs(VMBaseClass):
172 self.assertEqual(kname_uuid, btrfs_uuid)
173
174 def _test_partition_is_prep(self, info_file):
175- if self.target_release == "centos66":
176- raise SkipTest("Cannot detect PReP partitions in Centos66")
177 udev_info = self.load_collect_file(info_file).rstrip()
178 if not udev_info:
179 raise ValueError('Empty udev_info collect file')
180@@ -132,10 +123,7 @@ class TestBasicAbs(VMBaseClass):
181
182 def test_partition_numbers(self):
183 # pnum_disk should have partitions 1 2, and 10
184- if self.target_release != 'centos66':
185- disk = self._dname_to_kname('pnum_disk')
186- else:
187- disk = self._serial_to_kname('disk-d')
188+ disk = self._dname_to_kname('pnum_disk')
189
190 expected = [disk + s for s in ["", "1", "2", "10"]]
191 self._test_partition_numbers(disk, expected)
192@@ -220,19 +208,6 @@ class Centos70FocalTestBasic(centos_relbase.centos70_focal,
193 __test__ = True
194
195
196-class Centos66XenialTestBasic(centos_relbase.centos66_xenial,
197- CentosTestBasicAbs):
198- __test__ = True
199-
200-
201-class Centos66BionicTestBasic(centos_relbase.centos66_bionic,
202- CentosTestBasicAbs):
203- # Centos66 cannot handle ext4 defaults in Bionic (64bit,meta_csum)
204- # this conf defaults to ext3
205- conf_file = "examples/tests/centos6_basic.yaml"
206- __test__ = True
207-
208-
209 class XenialGAi386TestBasic(relbase.xenial_ga, TestBasicAbs):
210 __test__ = True
211 arch_skip = ["arm64", "ppc64el", "s390x"]
212diff --git a/tests/vmtests/test_network.py b/tests/vmtests/test_network.py
213index 1b42493..6ff3a16 100644
214--- a/tests/vmtests/test_network.py
215+++ b/tests/vmtests/test_network.py
216@@ -486,11 +486,6 @@ class ImpishTestNetworkBasic(relbase.impish, TestNetworkBasicAbs):
217 __test__ = True
218
219
220-class Centos66TestNetworkBasic(centos_relbase.centos66_xenial,
221- CentosTestNetworkBasicAbs):
222- __test__ = True
223-
224-
225 class Centos70TestNetworkBasic(centos_relbase.centos70_xenial,
226 CentosTestNetworkBasicAbs):
227 __test__ = True
228diff --git a/tests/vmtests/test_network_alias.py b/tests/vmtests/test_network_alias.py
229index 8b58edd..dd6ba02 100644
230--- a/tests/vmtests/test_network_alias.py
231+++ b/tests/vmtests/test_network_alias.py
232@@ -34,11 +34,6 @@ class CentosTestNetworkAliasAbs(TestNetworkAliasAbs):
233 pass
234
235
236-class Centos66TestNetworkAlias(centos_relbase.centos66_xenial,
237- CentosTestNetworkAliasAbs):
238- __test__ = True
239-
240-
241 class Centos70TestNetworkAlias(centos_relbase.centos70_xenial,
242 CentosTestNetworkAliasAbs):
243 __test__ = True
244diff --git a/tests/vmtests/test_network_bonding.py b/tests/vmtests/test_network_bonding.py
245index 73bcf60..ad0c1d4 100644
246--- a/tests/vmtests/test_network_bonding.py
247+++ b/tests/vmtests/test_network_bonding.py
248@@ -69,11 +69,6 @@ class ImpishTestBonding(relbase.impish, TestNetworkBondingAbs):
249 __test__ = True
250
251
252-class Centos66TestNetworkBonding(centos_relbase.centos66_xenial,
253- CentosTestNetworkBondingAbs):
254- __test__ = True
255-
256-
257 class Centos70TestNetworkBonding(centos_relbase.centos70_xenial,
258 CentosTestNetworkBondingAbs):
259 __test__ = True
260diff --git a/tests/vmtests/test_network_bridging.py b/tests/vmtests/test_network_bridging.py
261index 93ecc4b..9c90702 100644
262--- a/tests/vmtests/test_network_bridging.py
263+++ b/tests/vmtests/test_network_bridging.py
264@@ -41,8 +41,6 @@ default_bridge_params_uncheckable = [
265
266 # attrs we cannot validate
267 release_to_bridge_params_uncheckable = {
268- 'centos66': ['bridge_fd', 'bridge_hello', 'bridge_hw', 'bridge_maxage',
269- 'bridge_pathcost', 'bridge_portprio'],
270 'centos70': ['bridge_fd', 'bridge_hello', 'bridge_hw', 'bridge_maxage',
271 'bridge_pathcost', 'bridge_portprio'],
272 'xenial': ['bridge_ageing'],
273@@ -220,11 +218,6 @@ class CentosTestBridgeNetworkAbs(TestBridgeNetworkAbs):
274 self.assertTrue('bridge' in status)
275
276
277-class Centos66TestBridgeNetwork(centos_relbase.centos66_xenial,
278- CentosTestBridgeNetworkAbs):
279- __test__ = True
280-
281-
282 class Centos70TestBridgeNetwork(centos_relbase.centos70_xenial,
283 CentosTestBridgeNetworkAbs):
284 __test__ = True
285diff --git a/tests/vmtests/test_network_ipv6.py b/tests/vmtests/test_network_ipv6.py
286index 80b8ccf..f524e82 100644
287--- a/tests/vmtests/test_network_ipv6.py
288+++ b/tests/vmtests/test_network_ipv6.py
289@@ -65,11 +65,6 @@ class ImpishTestNetworkIPV6(relbase.impish, TestNetworkIPV6Abs):
290 __test__ = True
291
292
293-class Centos66TestNetworkIPV6(centos_relbase.centos66_xenial,
294- CentosTestNetworkIPV6Abs):
295- __test__ = True
296-
297-
298 class Centos70TestNetworkIPV6(centos_relbase.centos70_xenial,
299 CentosTestNetworkIPV6Abs):
300 __test__ = True
301diff --git a/tests/vmtests/test_network_ipv6_static.py b/tests/vmtests/test_network_ipv6_static.py
302index f24aab5..cb9caad 100644
303--- a/tests/vmtests/test_network_ipv6_static.py
304+++ b/tests/vmtests/test_network_ipv6_static.py
305@@ -35,11 +35,6 @@ class ImpishTestNetworkIPV6Static(relbase.impish, TestNetworkIPV6StaticAbs):
306 __test__ = True
307
308
309-class Centos66TestNetworkIPV6Static(centos_relbase.centos66_xenial,
310- CentosTestNetworkIPV6StaticAbs):
311- __test__ = True
312-
313-
314 class Centos70TestNetworkIPV6Static(centos_relbase.centos70_xenial,
315 CentosTestNetworkIPV6StaticAbs):
316 __test__ = True
317diff --git a/tests/vmtests/test_network_ipv6_vlan.py b/tests/vmtests/test_network_ipv6_vlan.py
318index a6eae41..7955101 100644
319--- a/tests/vmtests/test_network_ipv6_vlan.py
320+++ b/tests/vmtests/test_network_ipv6_vlan.py
321@@ -34,11 +34,6 @@ class ImpishTestNetworkIPV6Vlan(relbase.impish, TestNetworkIPV6VlanAbs):
322 __test__ = True
323
324
325-class Centos66TestNetworkIPV6Vlan(centos_relbase.centos66_xenial,
326- CentosTestNetworkIPV6VlanAbs):
327- __test__ = True
328-
329-
330 class Centos70TestNetworkIPV6Vlan(centos_relbase.centos70_xenial,
331 CentosTestNetworkIPV6VlanAbs):
332 __test__ = True
333diff --git a/tests/vmtests/test_network_mtu.py b/tests/vmtests/test_network_mtu.py
334index a36a752..f112b1c 100644
335--- a/tests/vmtests/test_network_mtu.py
336+++ b/tests/vmtests/test_network_mtu.py
337@@ -201,11 +201,6 @@ class ImpishTestNetworkMtu(relbase.impish, TestNetworkMtuNetworkdAbs):
338 __test__ = True
339
340
341-class Centos66TestNetworkMtu(centos_relbase.centos66_xenial,
342- CentosTestNetworkMtuAbs):
343- __test__ = True
344-
345-
346 class Centos70TestNetworkMtu(centos_relbase.centos70_xenial,
347 CentosTestNetworkMtuAbs):
348 __test__ = True
349diff --git a/tests/vmtests/test_network_static.py b/tests/vmtests/test_network_static.py
350index 95960af..867cf11 100644
351--- a/tests/vmtests/test_network_static.py
352+++ b/tests/vmtests/test_network_static.py
353@@ -40,11 +40,6 @@ class ImpishTestNetworkStatic(relbase.impish, TestNetworkStaticAbs):
354 __test__ = True
355
356
357-class Centos66TestNetworkStatic(centos_relbase.centos66_xenial,
358- CentosTestNetworkStaticAbs):
359- __test__ = True
360-
361-
362 class Centos70TestNetworkStatic(centos_relbase.centos70_xenial,
363 CentosTestNetworkStaticAbs):
364 __test__ = True
365diff --git a/tests/vmtests/test_network_static_routes.py b/tests/vmtests/test_network_static_routes.py
366index eb096ee..664c035 100644
367--- a/tests/vmtests/test_network_static_routes.py
368+++ b/tests/vmtests/test_network_static_routes.py
369@@ -43,11 +43,6 @@ class ImpishTestNetworkStaticRoutes(relbase.impish,
370 __test__ = True
371
372
373-class Centos66TestNetworkStaticRoutes(centos_relbase.centos66_xenial,
374- CentosTestNetworkStaticRoutesAbs):
375- __test__ = False
376-
377-
378 class Centos70TestNetworkStaticRoutes(centos_relbase.centos70_xenial,
379 CentosTestNetworkStaticRoutesAbs):
380 __test__ = False
381diff --git a/tests/vmtests/test_network_vlan.py b/tests/vmtests/test_network_vlan.py
382index 38bc87c..99bad66 100644
383--- a/tests/vmtests/test_network_vlan.py
384+++ b/tests/vmtests/test_network_vlan.py
385@@ -88,11 +88,6 @@ class ImpishTestNetworkVlan(relbase.impish, TestNetworkVlanAbs):
386 __test__ = True
387
388
389-class Centos66TestNetworkVlan(centos_relbase.centos66_xenial,
390- CentosTestNetworkVlanAbs):
391- __test__ = True
392-
393-
394 class Centos70TestNetworkVlan(centos_relbase.centos70_xenial,
395 CentosTestNetworkVlanAbs):
396 __test__ = True
397diff --git a/tests/vmtests/test_simple.py b/tests/vmtests/test_simple.py
398index 0ee87fc..2b91f0b 100644
399--- a/tests/vmtests/test_simple.py
400+++ b/tests/vmtests/test_simple.py
401@@ -29,15 +29,6 @@ class Centos70BionicTestSimple(centos_relbase.centos70_bionic, TestSimple):
402 __test__ = True
403
404
405-class Centos66XenialTestSimple(centos_relbase.centos66_xenial, TestSimple):
406- __test__ = True
407-
408-
409-class Centos66BionicTestSimple(centos_relbase.centos66_bionic, TestSimple):
410- __test__ = False
411- # LP: #1775424 Centos66 fails with Bionic Ephemeral ext4 features
412-
413-
414 class XenialTestSimple(relbase.xenial, TestSimple):
415 __test__ = True
416

Subscribers

People subscribed via source and target branches