This got broken in 94b835c and as a result all attempts to use this
directive failed.
Test suite passes. We also need to create a ticket to have a unit
test testing the presence of that attribute in every directive. Not part of
this patch.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | libtaskotron/directives/__init__.py (5 lines) | |||
| M | libtaskotron/directives/bodhi_comment_directive.py (1 line) | |||
| M | libtaskotron/runner.py (1 line) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 34ab267d757a | f7d48289be03 | 63c2ebfc3c70 | Kamil Páral | bodhi_comment_directive: fix missing directive_class variable (Show More…) | Jun 27 2014, 11:47 AM |
| Show All 10 Lines | |||||
| 11 | tasks, so that the tasks don't have to include a lot of commonly needed | 11 | tasks, so that the tasks don't have to include a lot of commonly needed | ||
| 12 | functionality and can rely on directives to do that instead. | 12 | functionality and can rely on directives to do that instead. | ||
| 13 | 13 | | |||
| 14 | Examples include downloading RPMs from Koji, creating Yum repositories, | 14 | Examples include downloading RPMs from Koji, creating Yum repositories, | ||
| 15 | reporting results to ResultsDB, or running an arbitrary python script (which | 15 | reporting results to ResultsDB, or running an arbitrary python script (which | ||
| 16 | is also used for the main task script execution). | 16 | is also used for the main task script execution). | ||
| 17 | 17 | | |||
| 18 | Each directive must inherit from :class:`BaseDirective` and implement its | 18 | Each directive must inherit from :class:`BaseDirective` and implement its | ||
| 19 | :meth:`~BaseDirective.process`` method. | 19 | :meth:`~BaseDirective.process`` method. It also needs to provide a global | ||
| 20 | variable :data:`directive_class` which specifies this child directive class name. | ||||
| 20 | 21 | | |||
| 21 | The documentation of the directives is done through two global variables - | 22 | The documentation of the directives is done through two global variables - | ||
| 22 | ``DOCUMENTATION`` and ``EXAMPLES``. In this file, you'll find a template for | 23 | ``DOCUMENTATION`` and ``EXAMPLES``. In this file, you'll find a template for | ||
| 23 | both these attributes.''' | 24 | both these attributes.''' | ||
| 24 | 25 | | |||
| 25 | DOCUMENTATION = """ | 26 | DOCUMENTATION = """ | ||
| 26 | # This is structured as a YAML document. If a key doesn't apply to your | 27 | # This is structured as a YAML document. If a key doesn't apply to your | ||
| 27 | # directive, simply remove it. You can use reST markup in all string fields. | 28 | # directive, simply remove it. You can use reST markup in all string fields. | ||
| ▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s) | |||||
| 75 | 76 | | |||
| 76 | - name: download f20-updates-pending to tagdownload | 77 | - name: download f20-updates-pending to tagdownload | ||
| 77 | koji: | 78 | koji: | ||
| 78 | action: download_tag | 79 | action: download_tag | ||
| 79 | tag: f20-updates-pending | 80 | tag: f20-updates-pending | ||
| 80 | target_dir: ${workdir}/tagdownload | 81 | target_dir: ${workdir}/tagdownload | ||
| 81 | """ | 82 | """ | ||
| 82 | 83 | | |||
| 84 | directive_class = 'BaseDirective' | ||||
| 85 | | ||||
| 83 | class BaseDirective(object): | 86 | class BaseDirective(object): | ||
| 84 | 87 | | |||
| 85 | def __init__(self): | 88 | def __init__(self): | ||
| 86 | pass | 89 | pass | ||
| 87 | 90 | | |||
| 88 | def process(self, input_data, env_data): | 91 | def process(self, input_data, env_data): | ||
| 89 | raise NotImplementedError | 92 | raise NotImplementedError | ||
| 90 | 93 | | |||
| Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s) | |||||
| 90 | 90 | | |||
| 91 | 91 | | |||
| 92 | # symbols used for consistant declaration of state | 92 | # symbols used for consistant declaration of state | ||
| 93 | PASS = 'state_PASS'# <%s>' % __name__ | 93 | PASS = 'state_PASS'# <%s>' % __name__ | ||
| 94 | FAIL = 'state_FAIL'# <%s>'% __name__ | 94 | FAIL = 'state_FAIL'# <%s>'% __name__ | ||
| 95 | INCOMPLETE = 'state_INCOMPLETE'# <%s>' % __name__ | 95 | INCOMPLETE = 'state_INCOMPLETE'# <%s>' % __name__ | ||
| 96 | UNKNOWN = 'state_UNKNOWN'# <%s>' % __name__ | 96 | UNKNOWN = 'state_UNKNOWN'# <%s>' % __name__ | ||
| 97 | 97 | | |||
| 98 | directive_class = 'BodhiCommentDirective' | ||||
| 98 | 99 | | |||
| 99 | class BodhiCommentDirective(BaseDirective): | 100 | class BodhiCommentDirective(BaseDirective): | ||
| 100 | 101 | | |||
| 101 | def __init__(self, bodhi_api=None): | 102 | def __init__(self, bodhi_api=None): | ||
| 102 | 103 | | |||
| 103 | if bodhi_api: | 104 | if bodhi_api: | ||
| 104 | self.bodhi_api = bodhi_api | 105 | self.bodhi_api = bodhi_api | ||
| 105 | else: | 106 | else: | ||
| ▲ Show 20 Lines • Show All 376 Lines • Show Last 20 Lines | |||||
| Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s) | 87 | def do_single_action(self, action): | |||
|---|---|---|---|---|---|
| 90 | 90 | | |||
| 91 | :param dict action: An action specification parsed from the task yaml | 91 | :param dict action: An action specification parsed from the task yaml | ||
| 92 | file | 92 | file | ||
| 93 | ''' | 93 | ''' | ||
| 94 | directive_name = self._extract_directive_from_action(action) | 94 | directive_name = self._extract_directive_from_action(action) | ||
| 95 | 95 | | |||
| 96 | rendered_action = self._render_action(action) | 96 | rendered_action = self._render_action(action) | ||
| 97 | 97 | | |||
| 98 | log.debug("Executing directive: %s", directive_name) | ||||
| 98 | self._load_directive(directive_name) | 99 | self._load_directive(directive_name) | ||
| 99 | 100 | | |||
| 100 | directive_object = self.directives[directive_name] | 101 | directive_object = self.directives[directive_name] | ||
| 101 | directive_classname = directive_object.directive_class | 102 | directive_classname = directive_object.directive_class | ||
| 102 | 103 | | |||
| 103 | directive_callable = getattr(directive_object, directive_classname)() | 104 | directive_callable = getattr(directive_object, directive_classname)() | ||
| 104 | 105 | | |||
| 105 | output = directive_callable.process(rendered_action[directive_name], | 106 | output = directive_callable.process(rendered_action[directive_name], | ||
| ▲ Show 20 Lines • Show All 105 Lines • Show Last 20 Lines | |||||