Differential D525

drop 'all', add 'current' check and waiting to 'compose'
ClosedPublic
Actions

Authored by adamwill on Aug 21 2015, 9:52 PM.

Tags

None

Subscribers

Details

Reviewers

garretraziel
jskladan

Commits

rOPENQAd6ad8f6ef2f8: drop 'all', add 'current' check and waiting to 'compose'

Summary

This is an alternative to D516. It drops the 'all' subcommand
entirely and adds some capabilities to 'compose' to make it
suitable for scripting. --ifnotcurrent will check if the compose
is the same as the current validation event, and bail out if it
is. --wait waits for the compose to be available. I've also
enhanced fedfind (in 1.4.1) to allow passing just 'Branched'
as the milestone; it will guess the release and date, now (it
didn't before).

With all of that taken together, we could have three cron jobs,
one for 'current', one for 'branched', and one for 'rawhide'.
That way we don't have to do any clever multiprocess/round-robin
waiting stuff, and the jobs for each release will be run and
reported as fast as possible (and we can run the compose report
right after the trigger script and have that sent out
efficiently too).

Test Plan

Try all the possibilities with 'compose' - especially
check that it works with just '-m Rawhide' and '-m Branched',
and that the --wait and --ifnotcurrent args work as intended.

Diff Detail

Repository

rOPENQA fedora_openqa

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

adamwill retitled this revision from to drop 'all', add 'current' check and waiting to 'compose'.Aug 21 2015, 9:52 PM

adamwill updated this object.

adamwill edited the test plan for this revision. (Show Details)

adamwill added reviewers: jskladan, garretraziel.

Herald added a subscriber: tflink. · View Herald TranscriptAug 21 2015, 9:52 PM

Ok, this looks good to me and I think that after all, this is better approach than D516.

This revision is now accepted and ready to land.Aug 24 2015, 8:33 AM

Closed by commit rOPENQAd6ad8f6ef2f8: drop 'all', add 'current' check and waiting to 'compose' (authored by adamwill). · Explain WhyAug 24 2015, 6:38 PM

This revision was automatically updated to reflect the committed changes.

adamwill mentioned this in D516: turn 'all' into 'nightlies' and wait for the composes.Aug 26 2015, 6:34 AM

Revision Contents

			Path	Packages
M			tools/openqa_trigger/openqa_trigger.py (109 lines)

Diff 1375

tools/openqa_trigger/openqa_trigger.py

1	#!/usr/bin/env python	1		#!/usr/bin/env python
2		2
3	import json	3		import json
4	import urlgrabber	4		import urlgrabber
5	import os.path	5		import os.path
6	import sys	6		import sys
7	import argparse	7		import argparse
8	import datetime	8		import datetime
9	import logging	9		import logging
		10		import time
10	# We can at least find images and run OpenQA jobs without wikitcms	11		# We can at least find images and run OpenQA jobs without wikitcms
11	try:	12		try:
12	import wikitcms.wiki	13		import wikitcms.wiki
13	except ImportError:	14		except ImportError:
14	wikitcms = None	15		wikitcms = None
15	import fedfind.release	16		import fedfind.release
16		17
17	from openqa_client.client import OpenQA_Client	18		from openqa_client.client import OpenQA_Client
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Line(s)		69	def run_openqa_jobs(client, isoname, flavor, arch, build):
90	logging.debug("executed")	91		logging.debug("executed")
91	logging.info("planned jobs: %s", output["ids"])	92		logging.info("planned jobs: %s", output["ids"])
92		93
93	return output["ids"]	94		return output["ids"]
94		95
95		96
96	def jobs_from_current(wiki, client):	97		def jobs_from_current(wiki, client):
97	"""Schedule jobs against the 'current' release validation event	98		"""Schedule jobs against the 'current' release validation event
98	(according to wikitcms) if we have not already. Returns a tuple,	99		(according to wikitcms) if we have not already. Returns the job
99	first value is the job list, second is the current event.	100		list.
100	"""	101		"""
101	if not wiki:	102		if not wiki:
102	logging.warning("python-wikitcms is required for current validation event discovery.")	103		logging.warning("python-wikitcms is required for current validation event discovery.")
103	return ([], None)	104		return ([], None)
104	last_versions, json_parsed = read_last()	105		last_versions, json_parsed = read_last()
105	currev = wiki.current_event	106		currev = wiki.current_event
106	logging.info("current event: %s", currev.version)	107		logging.info("current event: %s", currev.version)
107	runarches = []	108		runarches = []
Show All 16 Lines		121	try:
124	# write info about latest versions	125		# write info about latest versions
125	f = open(PERSISTENT, "w")	126		f = open(PERSISTENT, "w")
126	f.write(json.dumps(json_parsed))	127		f.write(json.dumps(json_parsed))
127	f.close()	128		f.close()
128	logging.debug("written info about newest version")	129		logging.debug("written info about newest version")
129	except TriggerException as e:	130		except TriggerException as e:
130	logging.error("cannot run jobs: %s", e)	131		logging.error("cannot run jobs: %s", e)
131		132
132	return (jobs, currev)	133		return jobs
133		134
134		135
135	def jobs_from_fedfind(ff_release, client, arches=ARCHES):	136		def jobs_from_fedfind(ff_release, client, arches=ARCHES):
136	"""Given a fedfind.Release object, find the ISOs we want and run	137		"""Given a fedfind.Release object, find the ISOs we want and run
137	jobs on them. arches is an iterable of arches to run on, if not	138		jobs on them. arches is an iterable of arches to run on, if not
138	specified, we'll use our constant.	139		specified, we'll use our constant.
139	"""	140		"""
140	# Find currently-testable images for our arches.	141		# Find currently-testable images for our arches.
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Line(s)
203	# SUB-COMMAND FUNCTIONS	204		# SUB-COMMAND FUNCTIONS
204		205
205		206
206	def run_current(args, client, wiki):	207		def run_current(args, client, wiki):
207	"""run OpenQA for current release validation event, if we have	208		"""run OpenQA for current release validation event, if we have
208	not already done it.	209		not already done it.
209	"""	210		"""
210	logging.info("running on current release")	211		logging.info("running on current release")
211	jobs, _ = jobs_from_current(wiki, client)	212		jobs = jobs_from_current(wiki, client)
212	# wait for jobs to finish and display results	213		# wait for jobs to finish and display results
213	if jobs:	214		if jobs:
214	logging.info("waiting for jobs: %s", ' '.join(str(j) for j in jobs))	215		logging.info("waiting for jobs: %s", ' '.join(str(j) for j in jobs))
215	report_results(jobs, client)	216		report_results(jobs, client)
216	logging.debug("finished")	217		logging.debug("finished")
217	sys.exit()	218		sys.exit()
218		219
219		220
220	def run_compose(args, client, wiki=None):	221		def run_compose(args, client, wiki=None):
221	"""run OpenQA on a specified compose, optionally reporting results	222		"""run OpenQA on a specified compose, optionally reporting results
222	if a matching wikitcms ValidationEvent is found by relval/wikitcms	223		if a matching wikitcms ValidationEvent is found by relval/wikitcms
223	"""	224		"""
224	# get the fedfind release object	225		# get the fedfind release object
225	try:	226		try:
226	logging.debug("querying fedfind on specific compose: %s %s %s", args.release,	227		logging.debug("querying fedfind on specific compose: %s %s %s", args.release,
227	args.milestone, args.compose)	228		args.milestone, args.compose)
228	ff_release = fedfind.release.get_release(release=args.release, milestone=args.milestone,	229		ff_release = fedfind.release.get_release(release=args.release, milestone=args.milestone,
229	compose=args.compose)	230		compose=args.compose)
230	except ValueError as err:	231		except ValueError as err:
231	logging.critical("compose %s %s %s was not found", args.release, args.milestone,	232		logging.critical("compose %s %s %s was not found", args.release, args.milestone,
232	args.compose)	233		args.compose)
233	sys.exit(err[0])	234		sys.exit(err[0])
234		235
235	logging.info("running on compose: %s", ff_release.version)	236		logging.info("running on compose: %s", ff_release.version)
		237
		238		if args.ifnotcurrent:
		239		try:
		240		currev = wiki.current_event
		241		# Compare currev's fedfind release version with ours
		242		if currev.ff_release.version == ff_release.version:
		243		logging.info("Compose is the current validation compose. Exiting.")
		244		sys.exit()
		245		except AttributeError:
		246		sys.exit("Wikitcms is required for --ifnotcurrent.")
		247
		248		if args.wait:
		249		logging.info("Waiting up to %s mins for compose", str(args.wait))
		250		waitstart = time.time()
		251		while True:
		252		if time.time() - waitstart > args.wait * 60:
		253		sys.exit("Wait timer expired! No jobs run.")
		254		logging.debug("Checking for compose...")
		255		if ff_release.koji_done and ff_release.pungi_done:
		256		logging.info("Compose complete! Scheduling jobs.")
		257		break
		258		else:
		259		time.sleep(120)
		260
236	jobs = []	261		jobs = []
237	try:	262		try:
238	if args.arch:	263		if args.arch:
239	jobs = jobs_from_fedfind(ff_release, client, [args.arch])	264		jobs = jobs_from_fedfind(ff_release, client, [args.arch])
240	else:	265		else:
241	jobs = jobs_from_fedfind(ff_release, client)	266		jobs = jobs_from_fedfind(ff_release, client)
242	except TriggerException as e:	267		except TriggerException as e:
243	logging.error("cannot run jobs: %s", e)	268		logging.error("cannot run jobs: %s", e)
244	logging.info("planned jobs: %s", ' '.join(str(j) for j in jobs))	269		logging.info("planned jobs: %s", ' '.join(str(j) for j in jobs))
245	if args.submit_results:	270		if args.submit_results:
246	report_results(jobs, client)	271		report_results(jobs, client)
247	logging.debug("finished")	272		logging.debug("finished")
248	sys.exit()	273		sys.exit()
249		274
250		275
251	def run_all(args, client, wiki=None):
252	"""Do everything we can: test current validation event compose if
253	it's new, amd test both Rawhide and Branched nightlies if they
254	exist and aren't the same as the 'current' compose.
255	"""
256	skip = ''
257	logging.info("running all")
258
259	# Run for 'current' validation event.
260	logging.debug("running for current")
261	(jobs, currev) = jobs_from_current(wiki, client)
262	logging.info("jobs from current validation event: %s", ' '.join(str(j) for j in jobs))
263
264	utcdate = datetime.datetime.utcnow()
265	if args.yesterday:
266	utcdate = utcdate - datetime.timedelta(days=1)
267	if currev and currev.compose == utcdate.strftime('%Y%m%d'):
268	# Don't schedule tests for the same compose as both "today's
269	# nightly" and "current validation event"
270	skip = currev.milestone
271	logging.debug("skipping %s because it's both today's and current validation event", skip)
272
273	# Run for day's Rawhide nightly (if not same as current event.)
274	if skip.lower() != 'rawhide':
275	try:
276	logging.debug("running for rawhide")
277	rawhide_ffrel = fedfind.release.get_release(release='Rawhide', compose=utcdate)
278	rawjobs = jobs_from_fedfind(rawhide_ffrel, client)
279	logging.info("jobs from rawhide %s: %s", rawhide_ffrel.version, ' '.join(str(j) for j in rawjobs))
280	jobs.extend(rawjobs)
281	except ValueError as err:
282	logging.error("rawhide image discovery failed: %s", err)
283	except TriggerException as e:
284	logging.error("cannot run jobs: %s", e)
285
286	# Run for day's Branched nightly (if not same as current event.)
287	# We must guess a release for Branched, fedfind cannot do so. Best
288	# guess we can make is the same as the 'current' validation event
289	# compose (this is why we have jobs_from_current return currev).
290	if skip.lower() != 'branched':
291	try:
292	logging.debug("running for branched")
293	branched_ffrel = fedfind.release.get_release(release=currev.release,
294	milestone='Branched', compose=utcdate)
295	branchjobs = jobs_from_fedfind(branched_ffrel, client)
296	logging.info("jobs from %s: %s", branched_ffrel.version, ' '.join(str(j) for j in branchjobs))
297	jobs.extend(branchjobs)
298	except ValueError as err:
299	logging.error("branched image discovery failed: %s", err)
300	except TriggerException as e:
301	logging.error("cannot run jobs: %s", e)
302	if jobs:
303	logging.info("waiting for jobs: %s", jobs)
304	report_results(jobs, client)
305	logging.debug("finished")
306	sys.exit()
307
308
309	if __name__ == "__main__":	276		if __name__ == "__main__":
310	test_help = "Operate on the staging wiki (for testing)"	277		test_help = "Operate on the staging wiki (for testing)"
311	parser = argparse.ArgumentParser(description=(	278		parser = argparse.ArgumentParser(description=(
312	"Run OpenQA tests for a release validation test event."))	279		"Run OpenQA tests for a release validation test event."))
313	subparsers = parser.add_subparsers()	280		subparsers = parser.add_subparsers()
314		281
315	parser_current = subparsers.add_parser(	282		parser_current = subparsers.add_parser(
316	'current', description="Run for the current event, if needed.")	283		'current', description="Run for the current event, if needed.")
Show All 18 Lines		299	parser_compose.add_argument(
335	metavar="{T,R}C1-19 or YYYYMMDD")	302		metavar="{T,R}C1-19 or YYYYMMDD")
336	parser_compose.add_argument(	303		parser_compose.add_argument(
337	'-a', '--arch', help="The arch to run for", required=False,	304		'-a', '--arch', help="The arch to run for", required=False,
338	choices=('x86_64', 'i386'))	305		choices=('x86_64', 'i386'))
339	parser_compose.add_argument(	306		parser_compose.add_argument(
340	'-s', '--submit-results', help="Submit the results to the release "	307		'-s', '--submit-results', help="Submit the results to the release "
341	"validation event for this compose, if possible", required=False,	308		"validation event for this compose, if possible", required=False,
342	action='store_true')	309		action='store_true')
		310		parser_compose.add_argument(
		311		'-w', '--wait', help="Wait NN minutes for the compose to appear, if "
		312		"it doesn't yet exist", type=int, metavar="NN", default=0,
		313		required=False)
		314		parser_compose.add_argument(
		315		'-i', '--ifnotcurrent', help="Only run if the compose is not the "
		316		"'current' validation compose. Mainly intended for cron runs on "
		317		"nightly builds, to avoid duplicating jobs run by a 'current' "
		318		"cron job. Requires wikitcms", action='store_true')
343	parser_compose.set_defaults(func=run_compose)	319		parser_compose.set_defaults(func=run_compose)
344		320
345	parser_all = subparsers.add_parser(
346	'all', description="Run for the current validation event (if needed) "
347	"and today's Rawhide and Branched nightly's (if found). 'Today' is "
348	"calculated for the UTC time zone, no matter the system timezone.")
349	parser_all.add_argument(
350	'-y', '--yesterday', help="Run on yesterday's nightlies, not today's",
351	required=False, action='store_true')
352	parser_all.set_defaults(func=run_all)
353
354	parser.add_argument(	321		parser.add_argument(
355	'-t', '--test', help=test_help, required=False, action='store_true')	322		'-t', '--test', help=test_help, required=False, action='store_true')
356	parser.add_argument(	323		parser.add_argument(
357	'-f', '--log-file', help="If given, log into specified file. When not provided, stdout"	324		'-f', '--log-file', help="If given, log into specified file. When not provided, stdout"
358	" is used", required=False)	325		" is used", required=False)
359	parser.add_argument(	326		parser.add_argument(
360	'-l', '--log-level', help="Specify log level to be outputted", required=False)	327		'-l', '--log-level', help="Specify log level to be outputted", required=False)
361	parser.add_argument('-i', '--iso-directory', help="Directory for downloading isos, default"	328		parser.add_argument('-i', '--iso-directory', help="Directory for downloading isos, default"
Show All 35 Lines