Differential D112

Unify envr/nevr terminology and handling
ClosedPublic
Actions

Authored by mkrizek on May 29 2014, 11:44 AM.

Details

Reviewers
kparal
tflink
Maniphest Tasks
T179: Unify envr/nevr terminology and handling
Commits
rLTRNbee3cf15d98c: Unify envr/nevr terminology and handling
Summary

Fixes T179

Test Plan

Run:

"python runtask.py -i 1:xchat-2.8.8-21.fc20 -t koji_build -a x86_64 task-rpmlint/rpmlint.yml"

and

"python runtask.py -i xchat-1:2.8.8-21.fc20 -t koji_build -a x86_64 task-rpmlint/rpmlint.yml"

Diff Detail

Repository
rLTRN libtaskotron
Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Unify envr/nevr terminology and handling.May 29 2014, 11:44 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, kparal.
mkrizek added a task: T179: Unify envr/nevr terminology and handling.
kparal accepted this revision.May 29 2014, 12:30 PM

Seems OK, beside that little terminology point. Shouldn't hopefully break anything.

readme.rst
88

I think you should just say NEVR instead of NEVR(A) here, because the architecture is in the <arch> argument. We only accept -i NVR/NEVR with -t koji_build. Therefore:

To run that task against a koji build with NEVR <nevr> for some arch <arch>

This revision is now accepted and ready to land.May 29 2014, 12:30 PM
tflink added inline comments.May 29 2014, 12:48 PM
docs/source/taskyaml.rst
203

shouldn't this be NEVR as well or are we using the (A) to indicate that the arch can be specified in the koji directive?

mkrizek updated this revision to Diff 322.May 29 2014, 12:52 PM

Fix terminology issue

mkrizek updated this revision to Diff 323.May 29 2014, 1:01 PM

Fix another terminology issue

tflink accepted this revision.May 29 2014, 1:01 PM

Looks good to me

mkrizek closed this revision.May 29 2014, 1:24 PM
mkrizek updated this revision to Diff 324.

Closed by commit rLTRNbee3cf15d98c (authored by @mkrizek).

kparal added inline comments.May 29 2014, 2:03 PM
docs/source/taskyaml.rst
203

Yeah, that's what I understood it implied - that the architecture can be specified in the directive. Not that important, though. Already pushed.

Revision Contents

Diff 324

View Options

docs/source/taskyaml.rst

Show First 20 Lines • Show All 194 Lines • ▼ Show 20 Line(s)
195Primarily a testing directive, it simply returns a status and 195​Primarily a testing directive, it simply returns a status and
196optionally a message. Also works as a useful placeholder while 196​optionally a message. Also works as a useful placeholder while
197writing new tasks. 197​writing new tasks.
198 198​
199koji 199​koji
200---- 200​----
201 201​
202Provides an interface to `koji <http://koji.fedoraproject.org/koji/>`_ for 202​Provides an interface to `koji <http://koji.fedoraproject.org/koji/>`_ for
203downloading rpms with a specific envr or rpms with a specific tag. 203​downloading rpms with a specific NEVR or rpms with a specific tag.
tflinkUnsubmitted
Not Done

shouldn't this be NEVR as well or are we using the (A) to indicate that the arch can be specified in the koji directive?

kparalUnsubmitted
Not Done

Yeah, that's what I understood it implied - that the architecture can be specified in the directive. Not that important, though. Already pushed.

204 204​
205mash 205​mash
206---- 206​----
207 207​
208Creates repositories from locally downloaded rpms. 208​Creates repositories from locally downloaded rpms.
209 209​
210python 210​python
211------ 211​------
Show All 9 Lines
View Options

libtaskotron/directives/koji_directive.py

1from libtaskotron.koji_utils import KojiClient 1​from libtaskotron.koji_utils import KojiClient
2from libtaskotron.logger import log 2​from libtaskotron.logger import log
3from libtaskotron.directives import BaseDirective 3​from libtaskotron.directives import BaseDirective
4from libtaskotron.exceptions import TaskotronDirectiveError 4​from libtaskotron.exceptions import TaskotronDirectiveError
5​from libtaskotron import rpm_utils
5 6​
6directive_class = 'KojiDirective' 7​directive_class = 'KojiDirective'
7 8​
8class KojiDirective(BaseDirective): 9​class KojiDirective(BaseDirective):
9 """The koji directive interfaces with Koji to facilitate various koji 10​ """The koji directive interfaces with Koji to facilitate various koji
10 actions. 11​ actions.
11 12​
12 format: "koji: target_dir=<target_dir> command=[download, download_tag] <command args> 13​ format: "koji: target_dir=<target_dir> command=[download, download_tag] <command args>
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)34 def process(self, input_data, env_data):
60 61​
61 if action == 'download': 62​ if action == 'download':
62 if 'koji_build' not in input_data: 63​ if 'koji_build' not in input_data:
63 detected_args = ', '.join(input_data.keys()) 64​ detected_args = ', '.join(input_data.keys())
64 raise TaskotronDirectiveError( 65​ raise TaskotronDirectiveError(
65 "The koji directive requires 'koji_build' for the 'download'" 66​ "The koji directive requires 'koji_build' for the 'download'"
66 "action. Detected arguments: %s" % detected_args) 67​ "action. Detected arguments: %s" % detected_args)
67 68​
68 koji_build = input_data['koji_build'] 69​ nvr = rpm_utils.rpmformat(input_data['koji_build'], 'nvr')
69 70​
70 log.info("Getting RPMs for koji build %s (%s) and downloading to %s", 71​ log.info("Getting RPMs for koji build %s (%s) and downloading to %s",
71 koji_build, str(self.arches), self.target_dir) 72​ nvr, str(self.arches), self.target_dir)
72 output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(koji_build, 73​ output_data['downloaded_rpms'] = self.koji.get_nvr_rpms(nvr,
73 self.target_dir, 74​ self.target_dir,
74 self.arches) 75​ self.arches)
75 elif action == 'download_tag': 76​ elif action == 'download_tag':
76 if 'koji_tag' not in input_data: 77​ if 'koji_tag' not in input_data:
77 detected_args = ', '.join(input_data.keys()) 78​ detected_args = ', '.join(input_data.keys())
78 raise TaskotronDirectiveError( 79​ raise TaskotronDirectiveError(
79 "The koji directive requires 'koji_tag' for the 'download_tag'" 80​ "The koji directive requires 'koji_tag' for the 'download_tag'"
80 "action. Detected arguments: %s" % detected_args) 81​ "action. Detected arguments: %s" % detected_args)
Show All 10 Lines
View Options

readme.rst

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Line(s)
80so make sure that you're editing the correct file if you create local copies. 80​so make sure that you're editing the correct file if you create local copies.
81 81​
82 82​
83Running a Task 83​Running a Task
84============== 84​==============
85 85​
86A relatively simple example task is `rpmlint <https://bitbucket.org/fedoraqa/task-rpmlint>`_. 86​A relatively simple example task is `rpmlint <https://bitbucket.org/fedoraqa/task-rpmlint>`_.
87 87​
88To run that task against a koji build with envr `<envr>` for some arch `<arch>` 88​To run that task against a koji build with NEVR `<nevr>` for some arch `<arch>`
kparalUnsubmitted
Not Done

I think you should just say NEVR instead of NEVR(A) here, because the architecture is in the <arch> argument. We only accept -i NVR/NEVR with -t koji_build. Therefore:

To run that task against a koji build with NEVR <nevr> for some arch <arch>

89, do the following:: 89​, do the following::
90 90​
91 git clone https://bitbucket.org/fedoraqa/task-rpmlint.git 91​ git clone https://bitbucket.org/fedoraqa/task-rpmlint.git
92 runtask -i <envr> -t koji_build -a <arch> task-rpmlint/rpmlint.yml 92​ runtask -i <nevr> -t koji_build -a <arch> task-rpmlint/rpmlint.yml
93 93​
94This will download the `<envr>` from koji into a temp directory under `/var/tmp/`, 94​This will download the `<nevr>` from koji into a temp directory under `/var/tmp/`,
95run rpmlint on the downloaded rpms and print output in TAP format to stdout. 95​run rpmlint on the downloaded rpms and print output in TAP format to stdout.
96 96​
97Example:: 97​Example::
98 98​
99 runtask -i xchat-2.8.8-21.fc20 -t koji_build -a x86_64 task-rpmlint/rpmlint.yml 99​ runtask -i xchat-2.8.8-21.fc20 -t koji_build -a x86_64 task-rpmlint/rpmlint.yml
100 100​
101 101​
102Running the Test Suite 102​Running the Test Suite
Show All 24 Lines
View Options

testing/test_runner.py

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)87 def test_yamlrunner_fails_input_is_string(self):
94 94​
95 test_runner = runner.Runner(ref_inputspec, test_args) 95​ test_runner = runner.Runner(ref_inputspec, test_args)
96 96​
97 with pytest.raises(TaskotronYamlError): 97​ with pytest.raises(TaskotronYamlError):
98 test_runner._validate_input() 98​ test_runner._validate_input()
99 99​
100class TestRunnerSetup(): 100​class TestRunnerSetup():
101 def test_trivial_creation(self, tmpdir): 101​ def test_trivial_creation(self, tmpdir):
102 ref_taskdata = {'preparation': {'koji': 'download envr'}, 102​ ref_taskdata = {'preparation': {'koji': 'download nvr'},
103 'input': {'args': ['koji_build','arch']}, 103​ 'input': {'args': ['koji_build','arch']},
104 'post': {'shell': 'clean'}, 104​ 'post': {'shell': 'clean'},
105 'execution': {'python': 'run_rpmlint.py'}, 105​ 'execution': {'python': 'run_rpmlint.py'},
106 'dependencies': ['rpmlint', 'libtaskbot']} 106​ 'dependencies': ['rpmlint', 'libtaskbot']}
107 ref_inputdata = {} 107​ ref_inputdata = {}
108 108​
109 test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir) 109​ test_runner = runner.Runner(ref_taskdata, ref_inputdata, tmpdir)
110 110​
▲ Show 20 Lines • Show All 298 Lines • Show Last 20 Lines