diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | setup.py | 10 | ||||
| -rw-r--r-- | tox.ini | 3 |
3 files changed, 7 insertions, 8 deletions
@@ -18,7 +18,7 @@ The [master branch](https://github.com/openshift/openshift-ansible/tree/master) tracks our current work and should be compatible with both [Origin master branch](https://github.com/openshift/origin/tree/master) and the [most recent Origin stable release](https://github.com/openshift/origin/releases). Currently -that's v1.4 and v1.3.x. In addition to the master branch, we maintain stable +that's v1.5 and v1.4. In addition to the master branch, we maintain stable branches corresponding to upstream Origin releases, e.g.: [release-1.2](https://github.com/openshift/openshift-ansible/tree/release-1.2). The most recent branch will often receive minor feature backports and fixes. @@ -104,14 +104,14 @@ class OpenShiftAnsibleYamlLint(Command): first = False print(format_method(problem, yaml_file)) - if problem.level == linter.PROBLEM_LEVELS['error']: + if problem.level == linter.PROBLEM_LEVELS[2]: has_errors = True - elif problem.level == linter.PROBLEM_LEVELS['warning']: + elif problem.level == linter.PROBLEM_LEVELS[1]: has_warnings = True - assert not has_errors, 'yamllint errors found' - assert not has_warnings, 'yamllint warnings found' - + if has_errors or has_warnings: + print('yammlint issues found') + exit(1) class OpenShiftAnsiblePylint(PylintCommand): ''' Class to override the default behavior of PylintCommand ''' @@ -1,8 +1,7 @@ [tox] minversion=2.3.1 envlist = - py{27,35}-ansible22-{pylint,unit,flake8} - yamllint + py{27,35}-ansible22-{pylint,unit,flake8,yamllint} skipsdist=True skip_missing_interpreters=True |