Merge lp:~powersj/utah/remove_cdromupgrade into lp:utah

Proposed by Joshua Powers
Status: Merged
Approved by: Paul Larson
Approved revision: 1103
Merged at revision: 1102
Proposed branch: lp:~powersj/utah/remove_cdromupgrade
Merge into: lp:utah
Diff against target: 33 lines (+1/-10)
2 files modified
utah/isotest/data/file_list_di (+0/-1)
utah/isotest/iso_static_validation.py (+1/-9)
To merge this branch: bzr merge lp:~powersj/utah/remove_cdromupgrade
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+323337@code.launchpad.net

Commit message

static validation: remove cdromupgrade

For releases in quantal and newer the cdromupgrade di file is not
present. Because we have gone around the alphabet this check
is no longer working and is no longer useful as no releases that
are tested even have it anymore. This removes the exclusion list
and removes cdromupgrade from the list of things to look for.

LP: #1686779

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Looks good, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utah/isotest/data/file_list_di'
--- utah/isotest/data/file_list_di 2012-11-16 19:27:27 +0000
+++ utah/isotest/data/file_list_di 2017-04-27 16:25:23 +0000
@@ -1,5 +1,4 @@
1boot1boot
2cdromupgrade
3.disk2.disk
4dists3dists
5doc4doc
65
=== modified file 'utah/isotest/iso_static_validation.py'
--- utah/isotest/iso_static_validation.py 2016-12-23 15:01:36 +0000
+++ utah/isotest/iso_static_validation.py 2017-04-27 16:25:23 +0000
@@ -354,18 +354,10 @@
354 else: # i386 or amd64354 else: # i386 or amd64
355 files_list = open(os.path.join(DATA_PATH, 'file_list_di'))355 files_list = open(os.path.join(DATA_PATH, 'file_list_di'))
356356
357 exclude_files = []
358 if self.st_release >= 'q':
359 # cdromupgrade is not shipped in quantal
360 exclude_files.append('cdromupgrade')
361
362 for list_server in files_list:357 for list_server in files_list:
363 logging.debug('check if important d-i files are present in iso')358 logging.debug('check if important d-i files are present in iso')
364 path = list_server.rstrip()359 path = list_server.rstrip()
365 if path in exclude_files:360 self.assertIn(path, stdout)
366 logging.debug('%s excluded based on release', path)
367 else:
368 self.assertIn(path, stdout)
369361
370 @unittest.skipIf(st_arch in ['powerpc', 'ppc64el'],362 @unittest.skipIf(st_arch in ['powerpc', 'ppc64el'],
371 "vmlinuz is not present only for powerpc images")363 "vmlinuz is not present only for powerpc images")

Subscribers

People subscribed via source and target branches

to all changes: