jjb
/
jenkins-job-builder
Code Issues Proposed changes

Removed the unnecessary empty combinationFilter Tag 

In the current implementation, jjb creates an empty
combinationFilter tag whenever there is `executionStrategy`.
This empty tag should not appear.

Change-Id: I2bf25ae58d12904ce0a00e0a5cfefbf27d9451ad
Signed-off-by: Eren ATAS <eatas.contractor@libertyglobal.com>
This commit is contained in:
Eren ATAS 2020-06-25 15:08:04 +02:00
parent 28e43831e9
commit 2e84bdf5b6
15 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins_jobs/modules/project_matrix.py
View File

@ -162,9 +162,10 @@ class Matrix(jenkins_jobs.modules.base.Base):
strategy = data.get(strategy_name, {})
if strategy_name == "execution-strategy":
XML.SubElement(root, "combinationFilter").text = str(
strategy.get("combination-filter", "")
).rstrip()
if "combination-filter" in strategy:
XML.SubElement(root, "combinationFilter").text = str(
strategy.get("combination-filter", "")
).rstrip()
XML.SubElement(ex_r, "runSequentially").text = str(
strategy.get("sequential", False)
).lower()

1
tests/cmd/fixtures/multi-path/output_recursive/job4
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes/>
<actions/>
<description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>

1
tests/general/fixtures/custom-workspace002.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes/>
<actions/>
<keepDependencies>false</keepDependencies>

1
tests/general/fixtures/matrix-axis-yaml.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<org.jenkinsci.plugins.yamlaxis.YamlAxis>
<name>python</name>

1
tests/general/fixtures/matrix-axis001.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
<name>config</name>

1
tests/general/fixtures/matrix-axis002.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
<name>config</name>

1
tests/general/fixtures/matrix-axis003.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<jenkins.plugins.shiningpanda.matrix.PythonAxis>
<name>PYTHON</name>

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

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.JDKAxis>
<name>jdk</name>

1
tests/general/fixtures/matrix-axis005.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
<name>config</name>

1
tests/general/fixtures/project-type002.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes/>
<actions/>
<keepDependencies>false</keepDependencies>

1
tests/wrappers/fixtures/matrix-tie-parent.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes/>
<buildWrappers>
<matrixtieparent.BuildWrapperMtp>

1
tests/yamlparser/fixtures/custom_distri.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>distribution</name>

3
tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>PLATFORM</name>
@ -32,7 +31,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>PLATFORM</name>
@ -61,7 +59,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>PLATFORM</name>

1
tests/yamlparser/fixtures/project-matrix002.xml
View File

@ -9,7 +9,6 @@
<color>BLUE</color>
</touchStoneResultCondition>
</executionStrategy>
<combinationFilter/>
<axes/>
<actions/>
<description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>

2
tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml
View File

@ -3,7 +3,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>foo_bar</name>
@ -45,7 +44,6 @@
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
<runSequentially>false</runSequentially>
</executionStrategy>
<combinationFilter/>
<axes>
<hudson.matrix.TextAxis>
<name>foo_bar</name>