Differential D365

add more explanation for upgradepath failures
ClosedPublic
Actions

Authored by kparal on May 5 2015, 11:08 AM.

Details

Reviewers
tflink
mkrizek
jskladan
Commits
rUPGR0981738ccb24: add more explanation for upgradepath failures
Summary

Today I spotted another person asking for explanation for upgradepath failures. I tried to
make the output even more obvious with this patch.

Before:

============================================================
fedora-upgrade-22.2-1.fc21 into f21-updates
============================================================
[ OK ] f20
        Latest package:         fedora-upgrade-20.2-1.fc20
[ OK ] f20-updates
        Latest package:         fedora-upgrade-21.3-1.fc20
[ OK ] f21
        Latest package:         fedora-upgrade-21.2-1.fc21
[--->] f21-updates
        Proposed package:       fedora-upgrade-22.2-1.fc21
[FAIL] f22 + f22-updates
        Latest package:         fedora-upgrade-22.1-1.fc22
        Latest pending package: None
        Error: Proposed package version must be lesser than or equal to the latest (pending) package version.
[ OK ] f23
        Latest package:         fedora-upgrade-22.2-1.fc23
        Latest pending package: None
RESULT: FAILED

After:

============================================================
fedora-upgrade-22.2-1.fc21 into f21-updates
============================================================
[ OK ] f20
        Latest package:         fedora-upgrade-20.2-1.fc20
[ OK ] f20-updates
        Latest package:         fedora-upgrade-21.3-1.fc20
[ OK ] f21
        Latest package:         fedora-upgrade-21.2-1.fc21
[--->] f21-updates
        Proposed package:       fedora-upgrade-22.2-1.fc21
[FAIL] f22 + f22-updates
        Latest package:         fedora-upgrade-22.1-1.fc22
        Latest pending package: None
        Error: Condition not satisfied: fedora-upgrade-22.2-1.fc21 <= fedora-upgrade-22.1-1.fc22
        Error: Proposed package version must be lesser than or equal to the latest (pending) package version.
[ OK ] f23
        Latest package:         fedora-upgrade-22.2-1.fc23
        Latest pending package: None
RESULT: FAILED
Test Plan

seems to work

Diff Detail

Repository
rUPGR task-upgradepath
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kparal retitled this revision from to add more explanation for upgradepath failures.May 5 2015, 11:08 AM
kparal updated this object.
kparal edited the test plan for this revision. (Show Details)
kparal added reviewers: mkrizek, jskladan, tflink.
jskladan accepted this revision.May 6 2015, 11:27 AM
This revision is now accepted and ready to land.May 6 2015, 11:27 AM
Closed by commit rUPGR0981738ccb24: add more explanation for upgradepath failures (authored by kparal). · Explain WhyMay 6 2015, 12:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mupgradepath.py (26 lines)

Diff 974

View Options

upgradepath.py

Show First 20 Lines • Show All 111 Lines • ▼ Show 20 Line(s)111 @param tag_builds dictionary that maps every available tag to the latest
112 Koji build object (or None) available for this tag 112​ Koji build object (or None) available for this tag
113 @param check_detail CheckDetail object related to the proposed build 113​ @param check_detail CheckDetail object related to the proposed build
114 @param check_pending look also into Bodhi for pending requests into 114​ @param check_pending look also into Bodhi for pending requests into
115 stable and consider it in the algorithm 115​ stable and consider it in the algorithm
116 @return overall check result of this comparison ('PASSED', 'INFO' or 116​ @return overall check result of this comparison ('PASSED', 'INFO' or
117 'FAILED') 117​ 'FAILED')
118 ''' 118​ '''
119 # convert 'op' to human language for error message clarity 119​ # convert 'op' to human language for error message clarity
120 opstr = {operator.eq: 'equal to', 120​ opstr = {operator.eq: ['==', 'equal to'],
121 operator.ge: 'greater than or equal to', 121​ operator.ge: ['>=', 'greater than or equal to'],
122 operator.gt: 'greater than', 122​ operator.gt: ['>', 'greater than'],
123 operator.le: 'lesser than or equal to', 123​ operator.le: ['<=', 'lesser than or equal to'],
124 operator.lt: 'lesser than', 124​ operator.lt: ['<', 'lesser than'],
125 operator.ne: 'not equal to'} 125​ operator.ne: ['!=', 'not equal to']}
126 assert op in opstr, 'Used unsupported operator: %s' % op 126​ assert op in opstr, 'Used unsupported operator: %s' % op
127 127​
128 infos = 0 128​ infos = 0
129 fails = 0 129​ fails = 0
130 130​
131 # check the build against all proposed tags or set of tags 131​ # check the build against all proposed tags or set of tags
132 for tag_tuple in tags: 132​ for tag_tuple in tags:
133 # convert everything to tuples 133​ # convert everything to tuples
134 if isinstance(tag_tuple, basestring): 134​ if isinstance(tag_tuple, basestring):
135 tag_tuple = (tag_tuple,) 135​ tag_tuple = (tag_tuple,)
136 136​
137 # make human readable string for this tag tuple 137​ # make human readable string for this tag tuple,
138​ # e.g. 'f22 + f22-updates'
138 tag_str = ' + '.join([tag for tag in tag_tuple]) 139​ tag_str = ' + '.join([tag for tag in tag_tuple])
139 140​
140 # find the latest build in repositories 141​ # find the latest build in repositories
141 latest_main_build = None 142​ latest_main_build = None
142 for tag in tag_tuple: 143​ for tag in tag_tuple:
143 build = tag_builds[tag] 144​ build = tag_builds[tag]
144 if cmpKojiNEVR(build, latest_main_build) > 0: 145​ if cmpKojiNEVR(build, latest_main_build) > 0:
145 latest_main_build = build 146​ latest_main_build = build
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Line(s)187 check_detail.store(' '*8 +
189 else 'None')) 190​ else 'None'))
190 if check_pending: 191​ if check_pending:
191 check_detail.store(' '*8 + 192​ check_detail.store(' '*8 +
192 'Latest pending package: '.ljust(Upgradepath.pkg_pad) + 193​ 'Latest pending package: '.ljust(Upgradepath.pkg_pad) +
193 (koji_utils.getNEVR(latest_pend_build) 194​ (koji_utils.getNEVR(latest_pend_build)
194 if latest_pend_build else 'None')) 195​ if latest_pend_build else 'None'))
195 196​
196 if not ok: 197​ if not ok:
198​ check_detail.store(' '*8 + 'Error: Condition not satisfied: '
199​ '%s %s %s' % (koji_utils.getNEVR(proposed_build), opstr[op][0],
200​ koji_utils.getNEVR(latest_build)))
197 check_detail.store(' '*8 + 'Error: Proposed package version must ' 201​ check_detail.store(' '*8 + 'Error: Proposed package version must '
198 'be %s the latest (pending) package version.' % opstr[op]) 202​ 'be %s the latest (pending) package version.' % opstr[op][1])
199 203​
200 if pend_needed: 204​ if pend_needed:
201 check_detail.store(' '*8 + 'The pending package must be pushed ' 205​ check_detail.store(' '*8 + 'Info: The pending package must be '
202 'together with (or before) the proposed package, otherwise ' 206​ 'pushed together with (or before) the proposed package, '
203 'the upgrade path will be broken.') 207​ 'otherwise the upgrade path will be broken.')
204 208​
205 # update the CheckDetail result 209​ # update the CheckDetail result
206 result = 'PASSED' 210​ result = 'PASSED'
207 ## FIXME: uncomment the two lines below once our bodhi_update_state.py 211​ ## FIXME: uncomment the two lines below once our bodhi_update_state.py
208 ## learns about the INFO result 212​ ## learns about the INFO result
209 #if infos > 0: 213​ #if infos > 0:
210 # result = 'INFO' 214​ # result = 'INFO'
211 if fails > 0: 215​ if fails > 0:
▲ Show 20 Lines • Show All 461 Lines • Show Last 20 Lines