T155 - always add noarch builds
ClosedPublic
Actions

Authored by jskladan on May 6 2014, 1:28 PM.

Details

Reviewers

kparal
tflink
mkrizek

Maniphest Tasks

T155: koji directive's download functionaltiy needs to be less strict about unavailable builds

Commits

rLTRNbbb5c6205464: T155 - always add noarch builds

Summary

According to T155, it seems to be a good idea to always download noarch rpms.

Test Plan

unittests appended

Diff Detail

Lint

Lint Skipped

Unit

Unit Tests Skipped

Looks fine except for the comment below.

libtaskotron/directives/koji_directive.py
84–85	For the sake of removing code duplication, wouldn't it be easier to have this before the if-clause and therefore only once? That also applies to `tmpdir`.

I'm OK with the changes but this won't work with the changes to koji_directive.py from D81. Please update to work with that code (also addresses @kparal's code duplication concern)

libtaskotron/directives/koji_directive.py
84–85	That was already changed in D81, actually

T155 - adressed the changes in D81

Looks good.

libtaskotron/directives/koji_directive.py
57–58	Just a minor point, maybe you could link T155 here, so that we know why we introduced this.

Looks good to me

Closed by commit rLTRNbbb5c6205464 (authored by @jskladan).

Revision Contents

			Path
M			libtaskotron/directives/koji_directive.py (5 lines)
M			testing/test_koji_directive.py (33 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	230	e74c632		May 6 2014, 1:28 PM	★	★
Diff 2	238	229bff5	- T155 - adressed the changes in D81	May 7 2014, 1:08 PM	★	★
Diff 3	239	229bff5	Commit rLTRNbbb5c62054645950ed4b37f47dceee197aef0142	May 7 2014, 1:17 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
312ccc2ad544	98ec2c81145c	f0d8a5d8479a	Josef Skladanka	T155 - adressed the changes in D81	May 7 2014, 1:08 PM
f0d8a5d8479a	b19072428fa7	229bff5dd2d7	Josef Skladanka	T155 - always add noarch builds (Show More…)	May 6 2014, 1:26 PM

Diff 239

View Options

libtaskotron/directives/koji_directive.py

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Line(s)		33	def process(self, input_data, env_data):
49		49
50	if not 'target_dir' in input_data:	50		if not 'target_dir' in input_data:
51	self.target_dir = env_data['workdir']	51		self.target_dir = env_data['workdir']
52	else:	52		else:
53	self.target_dir = input_data['target_dir']	53		self.target_dir = input_data['target_dir']
54		54
55	self.arches = [arch.strip() for arch in input_data['arch'].split(',')]	55		self.arches = [arch.strip() for arch in input_data['arch'].split(',')]
56		56
		57		# https://phab.qadevel.cloud.fedoraproject.org/T155
		58		if 'noarch' not in self.arches:
			kparalUnsubmitted Not Done Just a minor point, maybe you could link T155 here, so that we know why we introduced this.
		59		self.arches.append('noarch')
		60
57	if action == 'download':	61		if action == 'download':
58	if 'envr' not in input_data:	62		if 'envr' not in input_data:
59	detected_args = ', '.join(input_data.keys())	63		detected_args = ', '.join(input_data.keys())
60	raise TaskotronDirectiveError(	64		raise TaskotronDirectiveError(
61	"The koji directive requires 'envr' for the 'download'"	65		"The koji directive requires 'envr' for the 'download'"
62	"action. Detected arguments: %s" % detected_args)	66		"action. Detected arguments: %s" % detected_args)
63		67
64	envr = input_data['envr']	68		envr = input_data['envr']
65		69
66	log.info("getting koji builds for %s (%s) and downloading to %s",	70		log.info("getting koji builds for %s (%s) and downloading to %s",
67	envr, str(self.arches), self.target_dir)	71		envr, str(self.arches), self.target_dir)
68	output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(envr,	72		output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(envr,
69	self.target_dir,	73		self.target_dir,
70	self.arches)	74		self.arches)
71	elif action == 'download_tag':	75		elif action == 'download_tag':
72	if 'tag' not in input_data:	76		if 'tag' not in input_data:
73	detected_args = ', '.join(input_data.keys())	77		detected_args = ', '.join(input_data.keys())
74	raise TaskotronDirectiveError(	78		raise TaskotronDirectiveError(
75	"The koji directive requires 'tag' for the 'download_tag'"	79		"The koji directive requires 'tag' for the 'download_tag'"
76	"action. Detected arguments: %s" % detected_args)	80		"action. Detected arguments: %s" % detected_args)
77		81
78	tag = input_data['tag']	82		tag = input_data['tag']
79		83
80	log.info("getting koji builds for tag %s, arches %s and downloading"	84		log.info("getting koji builds for tag %s, arches %s and downloading"
81	"to %s", tag, str(self.arches), self.target_dir)	85		"to %s", tag, str(self.arches), self.target_dir)
			kparalUnsubmitted Not Done For the sake of removing code duplication, wouldn't it be easier to have this before the if-clause and therefore only once? That also applies to `tmpdir`.
			tflinkUnsubmitted Not Done That was already changed in D81, actually
82
83	output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(tag,	86		output_data['downloaded_rpms'] = self.koji.get_tagged_rpms(tag,
84	self.target_dir,	87		self.target_dir,
85	self.arches)	88		self.arches)
86		89
87	return output_data	90		return output_data