jjb
/
jenkins-job-builder
Code Issues Proposed changes

Fix axis expansion error message 

Change-Id: Ic5cfe925b600521cd3e1893e0340b9848ac1d798
This commit is contained in:
Vsevolod Fedorov 2024-02-22 12:53:51 +03:00
parent bb4fab9192
commit 0cc475f765
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins_jobs/dimensions.py
View File

@ -38,7 +38,7 @@ def _decode_axis_value(axis, value, key_pos, value_pos):
raise JenkinsJobsException( raise JenkinsJobsException(
f"Expected a value or a dict with single element, but got: {item!r}", f"Expected a value or a dict with single element, but got: {item!r}",
pos=value.value_pos[idx], pos=value.value_pos[idx],
ctx=[Context(f"In pamareter {axis!r} definition", key_pos)], ctx=[Context(f"In parameter {axis!r} definition", key_pos)],
) )
value, p = next(iter(item.items())) value, p = next(iter(item.items()))
yield LocDict.merge( yield LocDict.merge(

2
tests/yamlparser/error_fixtures/incorrect_template_dimensions.error
View File

@ -4,7 +4,7 @@ incorrect_template_dimensions.yaml:1:3: In project 'template_incorrect_args'
incorrect_template_dimensions.yaml:14:3: In job template 'template-incorrect-args-{stream}-{os}' incorrect_template_dimensions.yaml:14:3: In job template 'template-incorrect-args-{stream}-{os}'
- job-template: - job-template:
^ ^
incorrect_template_dimensions.yaml:6:5: In pamareter 'stream' definition incorrect_template_dimensions.yaml:6:5: In parameter 'stream' definition
stream: stream:
^ ^
incorrect_template_dimensions.yaml:7:9: Expected a value or a dict with single element, but got: {'current': None, 'branch': 'current'} incorrect_template_dimensions.yaml:7:9: Expected a value or a dict with single element, but got: {'current': None, 'branch': 'current'}