diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-15 14:13:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-15 14:13:52 +0000 |
| commit | c69fb5f68fcc642808d281f49fc41435d1d2f993 (patch) | |
| tree | dc57cc787facc43a90d858ad37746bd6eed1260e /jenkins_jobs | |
| parent | fdf4a3791545d1920ccb80aa4ba2cdd3422831c3 (diff) | |
| parent | 2e84bdf5b61743759d0d1ba5a5e85dda29bf58bf (diff) | |
| download | python-jenkins-job-builder-c69fb5f68fcc642808d281f49fc41435d1d2f993.tar.gz python-jenkins-job-builder-c69fb5f68fcc642808d281f49fc41435d1d2f993.tar.xz python-jenkins-job-builder-c69fb5f68fcc642808d281f49fc41435d1d2f993.zip | |
Merge "Removed the unnecessary empty combinationFilter Tag"
Diffstat (limited to 'jenkins_jobs')
| -rw-r--r-- | jenkins_jobs/modules/project_matrix.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jenkins_jobs/modules/project_matrix.py b/jenkins_jobs/modules/project_matrix.py index ebd566f5..01bc431d 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() |