openstack/project-config
Code Issues Proposed changes

Merge "Check that 'run-tox' is used instead of 'tox'"

Browse Source
This commit is contained in:
Jenkins 2016-11-16 09:36:55 +00:00 committed by Gerrit Code Review
commit cc10173ed2
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/jenkins-projects-checks.py
View File

@ -159,6 +159,7 @@ def validate_jobs():
# NOTE(pabelanger): Make sure console-log is our last publisher
# defined. We use the publisher to upload logs from zuul-launcher.
result = _check_console_log_publisher(schema, entry)
result += _check_tox_builder(schema, entry)
if result:
print(job_file)
count += result
@ -180,6 +181,25 @@ def _check_console_log_publisher(schema, entry):
return count
def _check_tox_builder(schema, entry):
count = 0
if schema == JOB or schema == JOB_TEMPLATE:
if 'builders' in entry:
for b in entry['builders']:
# Test for dict, coming from "tox:"
if isinstance(b, dict):
if 'tox' in b:
print("ERROR: Use 'run-tox' instead of 'tox' "
"builder in '%s':" % entry['name'])
count += 1
# And test for "tox" without arguments
elif isinstance(b, str) and b == 'tox':
print("ERROR: Use 'run-tox' instead of 'tox' "
"builder in '%s':" % entry['name'])
count += 1
return count
def check_all():
errors = validate_jobs()
errors = check_alphabetical() or errors