jjb/jenkins-job-builder
Code Issues Proposed changes

Fix wrong casing in JDKAxis <name> tag

Browse Source 
If value is written in uppercase letters, Jenkins converts it to
lowercase the next time the job configuration is saved.

  <hudson.matrix.JDKAxis>
    <name>JDK</name>

is changed to:

  <hudson.matrix.JDKAxis>
    <name>jdk</name>

As a result build URLs will change:

http://host/job/matrix_build/JDK=Java-7/1/

to:

http://host/job/matrix_build/jdk=Java-7/2/

Change-Id: Ia3018327c6dbffb2bb828dcc494559e57a1b6ad8
This commit is contained in:
Teemu Suvanto 2015-02-16 17:51:23 +01:00 committed by David Pursehouse
parent de2b287d6d
commit 9d57c4c47f
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/modules/project_matrix.py
View File

@ -177,7 +177,7 @@ class Matrix(jenkins_jobs.modules.base.Base):
lbl_root = XML.SubElement(ax_root, axis_name) lbl_root = XML.SubElement(ax_root, axis_name)
name, values = axis.get('name', ''), axis.get('values', ['']) name, values = axis.get('name', ''), axis.get('values', [''])
if axis_type == 'jdk': if axis_type == 'jdk':
XML.SubElement(lbl_root, 'name').text = 'JDK' XML.SubElement(lbl_root, 'name').text = 'jdk'
elif axis_type == 'python': elif axis_type == 'python':
XML.SubElement(lbl_root, 'name').text = 'PYTHON' XML.SubElement(lbl_root, 'name').text = 'PYTHON'
elif axis_type == 'tox': elif axis_type == 'tox':

2
tests/general/fixtures/matrix-axis004.xml
View File

@ -6,7 +6,7 @@
<combinationFilter/> <combinationFilter/>
<axes> <axes>
<hudson.matrix.JDKAxis> <hudson.matrix.JDKAxis>
<name>JDK</name> <name>jdk</name>
<values> <values>
<string>openjdk-6-jdk</string> <string>openjdk-6-jdk</string>
<string>openjdk-7-jdk</string> <string>openjdk-7-jdk</string>