diff --git a/jenkins_jobs/modules/project_matrix.py b/jenkins_jobs/modules/project_matrix.py index ebd566f59..01bc431d6 100644 --- a/jenkins_jobs/modules/project_matrix.py +++ b/jenkins_jobs/modules/project_matrix.py @@ -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() diff --git a/tests/cmd/fixtures/multi-path/output_recursive/job4 b/tests/cmd/fixtures/multi-path/output_recursive/job4 index dd47f9624..20f4d7fcf 100644 --- a/tests/cmd/fixtures/multi-path/output_recursive/job4 +++ b/tests/cmd/fixtures/multi-path/output_recursive/job4 @@ -3,7 +3,6 @@ false - <!-- Managed by Jenkins Job Builder --> diff --git a/tests/general/fixtures/custom-workspace002.xml b/tests/general/fixtures/custom-workspace002.xml index a3a266b65..3535e187d 100644 --- a/tests/general/fixtures/custom-workspace002.xml +++ b/tests/general/fixtures/custom-workspace002.xml @@ -3,7 +3,6 @@ false - false diff --git a/tests/general/fixtures/matrix-axis-yaml.xml b/tests/general/fixtures/matrix-axis-yaml.xml index 33724b97f..02ef44a06 100644 --- a/tests/general/fixtures/matrix-axis-yaml.xml +++ b/tests/general/fixtures/matrix-axis-yaml.xml @@ -3,7 +3,6 @@ false - python diff --git a/tests/general/fixtures/matrix-axis001.xml b/tests/general/fixtures/matrix-axis001.xml index da2c6c0d5..25929b6be 100644 --- a/tests/general/fixtures/matrix-axis001.xml +++ b/tests/general/fixtures/matrix-axis001.xml @@ -3,7 +3,6 @@ false - config diff --git a/tests/general/fixtures/matrix-axis002.xml b/tests/general/fixtures/matrix-axis002.xml index fa00869b7..1f6363bfa 100644 --- a/tests/general/fixtures/matrix-axis002.xml +++ b/tests/general/fixtures/matrix-axis002.xml @@ -3,7 +3,6 @@ false - config diff --git a/tests/general/fixtures/matrix-axis003.xml b/tests/general/fixtures/matrix-axis003.xml index 538337cc0..1541278d4 100644 --- a/tests/general/fixtures/matrix-axis003.xml +++ b/tests/general/fixtures/matrix-axis003.xml @@ -3,7 +3,6 @@ false - PYTHON diff --git a/tests/general/fixtures/matrix-axis004.xml b/tests/general/fixtures/matrix-axis004.xml index 1c0559104..ce2767233 100644 --- a/tests/general/fixtures/matrix-axis004.xml +++ b/tests/general/fixtures/matrix-axis004.xml @@ -3,7 +3,6 @@ false - jdk diff --git a/tests/general/fixtures/matrix-axis005.xml b/tests/general/fixtures/matrix-axis005.xml index 691226112..753e4d109 100644 --- a/tests/general/fixtures/matrix-axis005.xml +++ b/tests/general/fixtures/matrix-axis005.xml @@ -3,7 +3,6 @@ false - config diff --git a/tests/general/fixtures/project-type002.xml b/tests/general/fixtures/project-type002.xml index ede8bc0a6..ae27ec89a 100644 --- a/tests/general/fixtures/project-type002.xml +++ b/tests/general/fixtures/project-type002.xml @@ -3,7 +3,6 @@ false - false diff --git a/tests/wrappers/fixtures/matrix-tie-parent.xml b/tests/wrappers/fixtures/matrix-tie-parent.xml index 9d2c65b89..f88d63b5a 100644 --- a/tests/wrappers/fixtures/matrix-tie-parent.xml +++ b/tests/wrappers/fixtures/matrix-tie-parent.xml @@ -3,7 +3,6 @@ false - diff --git a/tests/yamlparser/fixtures/custom_distri.xml b/tests/yamlparser/fixtures/custom_distri.xml index a12900d82..cf9e6467a 100644 --- a/tests/yamlparser/fixtures/custom_distri.xml +++ b/tests/yamlparser/fixtures/custom_distri.xml @@ -3,7 +3,6 @@ false - distribution diff --git a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml index 8d582dbac..0923b125b 100644 --- a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml +++ b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml @@ -3,7 +3,6 @@ false - PLATFORM @@ -32,7 +31,6 @@ false - PLATFORM @@ -61,7 +59,6 @@ false - PLATFORM diff --git a/tests/yamlparser/fixtures/project-matrix002.xml b/tests/yamlparser/fixtures/project-matrix002.xml index a31faadaa..e9fe86303 100644 --- a/tests/yamlparser/fixtures/project-matrix002.xml +++ b/tests/yamlparser/fixtures/project-matrix002.xml @@ -9,7 +9,6 @@ BLUE - <!-- Managed by Jenkins Job Builder --> diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml index f2bf89fa3..18637ea3a 100644 --- a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml +++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml @@ -3,7 +3,6 @@ false - foo_bar @@ -45,7 +44,6 @@ false - foo_bar