Revert "Extract pep8 messages for inline comments"
There seems to be a problem with openstack-zuul-jobs [1].
This reverts commit 421f533b61
.
[1] http://logs.openstack.org/86/610386/3/gate/openstack-zuul-jobs-linters/a8c857d/job-output.txt.gz#_2018-10-18_07_14_42_431592
Change-Id: Iac5236221e33df4613cc2f7a2edcffc323902320
This commit is contained in:
parent
421f533b61
commit
b35f47190a
@ -1,75 +0,0 @@
|
|||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
# Copyright (c) 2018 Red Hat
|
|
||||||
#
|
|
||||||
# This module is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This software is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this software. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
from __future__ import absolute_import, division, print_function
|
|
||||||
__metaclass__ = type
|
|
||||||
|
|
||||||
DOCUMENTATION = '''
|
|
||||||
---
|
|
||||||
module: tox_parse_output
|
|
||||||
short_description: Parses the output of tox looking for per-line comments
|
|
||||||
author: Monty Taylor (@mordred)
|
|
||||||
description:
|
|
||||||
- Looks for output from the tox command to find content that could be
|
|
||||||
returned as inline comments.
|
|
||||||
requirements:
|
|
||||||
- "python >= 3.5"
|
|
||||||
options:
|
|
||||||
tox_output:
|
|
||||||
description:
|
|
||||||
- Output from the tox command run
|
|
||||||
required: true
|
|
||||||
type: str
|
|
||||||
'''
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
|
||||||
|
|
||||||
|
|
||||||
def extract_file_comments(tox_output):
|
|
||||||
ret = {}
|
|
||||||
for line in tox_output.split('\n'):
|
|
||||||
try:
|
|
||||||
if not line:
|
|
||||||
continue
|
|
||||||
if line[0].isspace():
|
|
||||||
continue
|
|
||||||
if ': ' not in line:
|
|
||||||
continue
|
|
||||||
(file_info, message) = line.split(': ', 1)
|
|
||||||
(file_path, start_line, start_char) = file_info.split(':')
|
|
||||||
if file_path.startswith('./'):
|
|
||||||
file_path = file_path[2:]
|
|
||||||
ret.setdefault(file_path, [])
|
|
||||||
ret[file_path].append(dict(line=int(start_line),
|
|
||||||
message=message))
|
|
||||||
except Exception:
|
|
||||||
pass
|
|
||||||
return ret
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
module = AnsibleModule(
|
|
||||||
argument_spec=dict(
|
|
||||||
tox_output=dict(required=True, type='str'),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
tox_output = module.params['tox_output']
|
|
||||||
|
|
||||||
file_comments = extract_file_comments(tox_output)
|
|
||||||
module.exit_json(changed=False, file_comments=file_comments)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
@ -36,26 +36,3 @@
|
|||||||
chdir: "{{ zuul_work_dir }}"
|
chdir: "{{ zuul_work_dir }}"
|
||||||
environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}"
|
environment: "{{ tox_environment|combine(tox_constraints_env|default({})) }}"
|
||||||
command: "{{ tox_executable }} -e{{ tox_envlist }} {{ tox_extra_args }}"
|
command: "{{ tox_executable }} -e{{ tox_envlist }} {{ tox_extra_args }}"
|
||||||
failed_when: false
|
|
||||||
register: tox_output
|
|
||||||
|
|
||||||
- name: Look for output
|
|
||||||
tox_parse_output:
|
|
||||||
tox_output: '{{ tox_output.stdout }}'
|
|
||||||
register: file_comments
|
|
||||||
|
|
||||||
- name: Return file comments to Zuul
|
|
||||||
when: file_comments.file_comments
|
|
||||||
delegate_to: localhost
|
|
||||||
zuul_return:
|
|
||||||
data:
|
|
||||||
zuul:
|
|
||||||
file_comments: '{{ file_comments.file_comments }}'
|
|
||||||
tags:
|
|
||||||
# Avoid "no action detected in task" linter error
|
|
||||||
- skip_ansible_lint
|
|
||||||
|
|
||||||
- name: Return tox status
|
|
||||||
fail:
|
|
||||||
msg: 'tox exited with return code {{ tox_output.rc }}'
|
|
||||||
when: tox_output.rc != 0
|
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
flake8
|
flake8
|
||||||
|
zuul
|
||||||
|
|
||||||
# We need to pin the ansible version directly here; per the
|
# We need to pin the ansible version directly here; per the
|
||||||
# deprecation policy it should trail the version used by Zuul by 4
|
# deprecation policy it should trail the version used by Zuul by 4
|
||||||
|
4
tox.ini
4
tox.ini
@ -26,10 +26,6 @@ commands =
|
|||||||
sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
|
sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
deps =
|
|
||||||
# Zuul is required to supply the zuul ansible modules for ansible-lint
|
|
||||||
-r{toxinidir}/test-requirements.txt
|
|
||||||
-egit+https://git.openstack.org/openstack-infra/zuul#egg=zuul
|
|
||||||
passenv =
|
passenv =
|
||||||
# NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
|
# NOTE(pabelanger): if you'd like to run tox -elinters locally, you'll need
|
||||||
# to export ANSIBLE_ROLES_PATH pointing to the currect repos.
|
# to export ANSIBLE_ROLES_PATH pointing to the currect repos.
|
||||||
|
Loading…
Reference in New Issue
Block a user