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
1=== modified file 'utah/isotest/data/file_list_di'
2--- utah/isotest/data/file_list_di 2012-11-16 19:27:27 +0000
3+++ utah/isotest/data/file_list_di 2017-04-27 16:25:23 +0000
4@@ -1,5 +1,4 @@
5 boot
6-cdromupgrade
7 .disk
8 dists
9 doc
10
11=== modified file 'utah/isotest/iso_static_validation.py'
12--- utah/isotest/iso_static_validation.py 2016-12-23 15:01:36 +0000
13+++ utah/isotest/iso_static_validation.py 2017-04-27 16:25:23 +0000
14@@ -354,18 +354,10 @@
15 else: # i386 or amd64
16 files_list = open(os.path.join(DATA_PATH, 'file_list_di'))
17
18- exclude_files = []
19- if self.st_release >= 'q':
20- # cdromupgrade is not shipped in quantal
21- exclude_files.append('cdromupgrade')
22-
23 for list_server in files_list:
24 logging.debug('check if important d-i files are present in iso')
25 path = list_server.rstrip()
26- if path in exclude_files:
27- logging.debug('%s excluded based on release', path)
28- else:
29- self.assertIn(path, stdout)
30+ self.assertIn(path, stdout)
31
32 @unittest.skipIf(st_arch in ['powerpc', 'ppc64el'],
33 "vmlinuz is not present only for powerpc images")

Subscribers

People subscribed via source and target branches

to all changes: