update for bodhi 2.0
ClosedPublic
Actions

Questions about the bodhi-related changes to libtaskotron - I thought we didn't need to worry about whether or not an update had an updateid/alias anymore

upgradepath.py
90–91	Is this needed anymore? I thought that bodhi12 was assigning an updateid (or alias?) to updates on creation instead of at push time. can we just ignore the title?
567	same question as above - do we need to have the title as a backup anymore?

upgradepath.py
90–91	It seems that `updateid` was renamed to `alias`, at least I haven't seen `updateid` anywhere. If Luke confirms that `alias` exists for all update objects, then yes, we can get rid of falling back to `title`.

upgradepath.py
90–91	Confirmed by Luke. I'll amend the patch.

use Bodhi update aliases

tflink accepted this revision.Aug 18 2015, 8:29 PM

This revision is now accepted and ready to land.Aug 18 2015, 8:29 PM

Closed by commit rUPGR6d87567ba663: update for bodhi 2.0 (authored by kparal). · Explain WhyAug 18 2015, 8:39 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			upgradepath.py (20 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1327	cac7a7a		Aug 18 2015, 3:16 PM	★	★
Diff 2	1331	cac7a7a	- use Bodhi update aliases	Aug 18 2015, 7:38 PM	★	★
Diff 3	1333	cac7a7a	Commit rUPGR6d87567ba66371b542c017a06914ec86a6bff872	Aug 18 2015, 8:38 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
690bb6508de0	4377cd113bf7	1e423bea8d75	Kamil Páral	use Bodhi update aliases (Show More…)	Aug 18 2015, 7:38 PM
1e423bea8d75	93fa4f989d73	cac7a7a03b5f	Kamil Páral	update for bodhi 2.0 (Show More…)	Aug 18 2015, 3:06 PM

	Status	Author	Revision
	Closed	kparal	D505 update for bodhi 2.0
	Closed	kparal	D506 adjust for Bodhi 2.0

Diff 1333

View Options

upgradepath.py

Show First 20 Lines • Show All 81 Lines • ▼ Show 20 Line(s)		74	try:
82	for build, detail in self.build2detail.items():	82		for build, detail in self.build2detail.items():
83	filepath = os.path.join(storedir, build) + '.log'	83		filepath = os.path.join(storedir, build) + '.log'
84	fout = open(filepath, 'w')	84		fout = open(filepath, 'w')
85	fout.write('\n'.join(detail.output) + '\n')	85		fout.write('\n'.join(detail.output) + '\n')
86	fout.close()	86		fout.close()
87	detail.artifact = filepath	87		detail.artifact = filepath
88		88
89	# save update logs	89		# save update logs
90	for update, detail in self.update2detail.items():	90		for update, detail in self.update2detail.items():
91	filename = (update.update['updateid'] or update.update['title']) + '.log'	91		filename = update.update['alias'] + '.log'
			tflinkUnsubmitted Done Is this needed anymore? I thought that bodhi12 was assigning an updateid (or alias?) to updates on creation instead of at push time. can we just ignore the title?
			kparalAuthorUnsubmitted Done It seems that `updateid` was renamed to `alias`, at least I haven't seen `updateid` anywhere. If Luke confirms that `alias` exists for all update objects, then yes, we can get rid of falling back to `title`.
			kparalAuthorUnsubmitted Done Confirmed by Luke. I'll amend the patch.
92	# update titles can be very long, we need to trim them
93	if len(filename) > 255: # the max file name length for most Linux filesystems
94	suffix = '....log'
95	filename = filename[:255-len(suffix)] + suffix
96	assert len(filename) <= 255
97	filepath = os.path.join(storedir, filename)	92		filepath = os.path.join(storedir, filename)
98	fout = open(filepath, 'w')	93		fout = open(filepath, 'w')
99	fout.write('\n'.join(detail.output) + '\n')	94		fout.write('\n'.join(detail.output) + '\n')
100	fout.close()	95		fout.close()
101	detail.artifact = filepath	96		detail.artifact = filepath
102		97
103	except OSError as e:	98		except OSError as e:
104	logger.error('Individual logs not saved into %s, an error occured. '	99		logger.error('Individual logs not saved into %s, an error occured. '
▲ Show 20 Lines • Show All 153 Lines • ▼ Show 20 Line(s)		252	if (tag not in self.repoinfo.releases() and
258	tag != self.repoinfo.branched()):	253		tag != self.repoinfo.branched()):
259	return None	254		return None
260		255
261	# bodhi uses names in format 'F19', 'F20', let's convert it	256		# bodhi uses names in format 'F19', 'F20', let's convert it
262	bodhi_tag = tag.upper()	257		bodhi_tag = tag.upper()
263		258
264	# query bodhi for the last update of this package that just requests	259		# query bodhi for the last update of this package that just requests
265	# going into main or stable updates repo	260		# going into main or stable updates repo
266	requests = self.bodhi.client.query(package=pkgname, request='stable',	261		requests = self.bodhi.client.query(packages=pkgname, request='stable',
267	release=bodhi_tag, limit=1)	262		releases=[bodhi_tag], limit=1)
268		263
269	# if there is no Bodhi request, there is nothing to do	264		# if there is no Bodhi request, there is nothing to do
270	if not requests['updates']:	265		if not requests['updates']:
271	return None	266		return None
272		267
273	# we found our update. this first one should be the most recent one	268		# we found our update. this first one should be the most recent one
274	# (yuck, not optimal! but we use that approach everywhere anyway)	269		# (yuck, not optimal! but we use that approach everywhere anyway)
275	update = requests['updates'][0]	270		update = requests['updates'][0]
▲ Show 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s)		289	def run_once(self, kojitag, event='post-bodhi-update-batch', **kwargs):
393		388
394	for build, update in failures.items():	389		for build, update in failures.items():
395	if update is None:	390		if update is None:
396	# build not found in Bodhi	391		# build not found in Bodhi
397	msg = 'Update containing %s not found in Bodhi' % build	392		msg = 'Update containing %s not found in Bodhi' % build
398	else:	393		else:
399	# some other builds from the matching update were not scheduled	394		# some other builds from the matching update were not scheduled
400	msg = ("Build %s is part of an incompletely scheduled Bodhi "	395		msg = ("Build %s is part of an incompletely scheduled Bodhi "
401	"update '%s'." % (build, update['title']))	396		"update '%s'." % (build, update['alias']))
402	logger.warning(msg)	397		logger.warning(msg)
403	# FIXME: find out how to report these errors, currently they are not	398		# FIXME: find out how to report these errors, currently they are not
404	# easily visible anywhere (ResultsDB or elsewhere)	399		# easily visible anywhere (ResultsDB or elsewhere)
405	self.problematic[build] = msg	400		self.problematic[build] = msg
406	nevrs.remove(build)	401		nevrs.remove(build)
407		402
408	# we need Bodhi object to be hashable to use them in sets and dicts	403		# we need Bodhi object to be hashable to use them in sets and dicts
409	# let's convert it	404		# let's convert it
410	bodhi_objects = set()	405		bodhi_objects = set()
411	for build, update in build2update.items():	406		for build, update in build2update.items():
412	same = [bo for bo in bodhi_objects if bo.update is update]	407		same = [bo for bo in bodhi_objects if bo.update is update]
413	if same:	408		if same:
414	build2update[build] = same[0]	409		build2update[build] = same[0]
415	else:	410		else:
416	build2update[build] = BodhiUpdate(update)	411		build2update[build] = BodhiUpdate(update)
417	bodhi_objects.add(build2update[build])	412		bodhi_objects.add(build2update[build])
418		413
419	# print some debugging Bodhi info	414		# print some debugging Bodhi info
420	def bodhi_desc(update):	415		def bodhi_desc(update):
421	if update.update['updateid']:	416		return '%s (%s)' % (update.update['alias'], update.update['title'])
422	return '%s (%s)' % (update.update['updateid'], update.update['title'])
423	else:
424	return update.update['title']
425	logger.debug('%s Bodhi updates found:\n %s',	417		logger.debug('%s Bodhi updates found:\n %s',
426	len(set(build2update.values())),	418		len(set(build2update.values())),
427	'\n '.join(sorted([bodhi_desc(update) for update in	419		'\n '.join(sorted([bodhi_desc(update) for update in
428	set(build2update.values())])))	420		set(build2update.values())])))
429		421
430	# Get build info from Koji for every NEVR	422		# Get build info from Koji for every NEVR
431	# Use multicall to speed it up	423		# Use multicall to speed it up
432	logger.info('Getting build information from Koji...')	424		logger.info('Getting build information from Koji...')
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Line(s)
567	summary = check.CheckDetail.create_multi_item_summary(	559		summary = check.CheckDetail.create_multi_item_summary(
568	self.build2detail.values())	560		self.build2detail.values())
569	logger.info('OVERALL SUMMARY: ' + summary)	561		logger.info('OVERALL SUMMARY: ' + summary)
570		562
571	# Aggregate individual build results to Bodhi update results	563		# Aggregate individual build results to Bodhi update results
572	for build, update in sorted(build2update.iteritems(), key=lambda t: t[0]):	564		for build, update in sorted(build2update.iteritems(), key=lambda t: t[0]):
573	if update not in self.update2detail:	565		if update not in self.update2detail:
574	self.update2detail[update] = check.CheckDetail(	566		self.update2detail[update] = check.CheckDetail(
575	item=update.update['updateid'] or update.update['title'],	567		item=update.update['alias'],
			tflinkUnsubmitted Done same question as above - do we need to have the title as a backup anymore?
576	report_type=check.ReportType.BODHI_UPDATE)	568		report_type=check.ReportType.BODHI_UPDATE)
577		569
578	update_detail = self.update2detail[update]	570		update_detail = self.update2detail[update]
579	build_detail = self.build2detail[build]	571		build_detail = self.build2detail[build]
580	update_detail.update_outcome(build_detail.outcome)	572		update_detail.update_outcome(build_detail.outcome)
581	update_detail.output.extend(build_detail.output)	573		update_detail.output.extend(build_detail.output)
582		574
583	for update, detail in self.update2detail.iteritems():	575		for update, detail in self.update2detail.iteritems():
▲ Show 20 Lines • Show All 103 Lines • Show Last 20 Lines

update for bodhi 2.0ClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 1333

upgradepath.py

update for bodhi 2.0
ClosedPublic
Actions