diff --git a/jenkins_jobs/modules/project_multibranch.py b/jenkins_jobs/modules/project_multibranch.py
index 3b1c331e0..14ebd6166 100644
--- a/jenkins_jobs/modules/project_multibranch.py
+++ b/jenkins_jobs/modules/project_multibranch.py
@@ -58,6 +58,8 @@ Plugins required:
(default '-1, all')
* **days-to-keep** (`int`): For how many days should a build be kept.
(default '-1, forever')
+ * **abort-builds** (`bool`): Abort all pending or ongoing builds for removed
+ SCM heads (i.e. deleted branches). (default false)
* **script-path** (`str`): Path to Jenkinsfile, relative to workspace.
(default 'Jenkinsfile')
* **script-id** (`str`): Script id from the global Jenkins script store
@@ -220,6 +222,7 @@ class WorkflowMultiBranch(jenkins_jobs.modules.base.Base):
("prune-dead-branches", "pruneDeadBranches", True, [True, False]),
("days-to-keep", "daysToKeep", -1),
("number-to-keep", "numToKeep", -1),
+ ("abort-builds", "abortBuilds", False, [True, False]),
]
helpers.convert_mapping_to_xml(ois, data, ois_mapping)
diff --git a/tests/multibranch/fixtures/multi_scm_full.xml b/tests/multibranch/fixtures/multi_scm_full.xml
index f0dd2aed1..2a8fa17cc 100644
--- a/tests/multibranch/fixtures/multi_scm_full.xml
+++ b/tests/multibranch/fixtures/multi_scm_full.xml
@@ -26,6 +26,7 @@
true
10
10
+ true
diff --git a/tests/multibranch/fixtures/multi_scm_full.yaml b/tests/multibranch/fixtures/multi_scm_full.yaml
index f9978c32f..a48325c68 100644
--- a/tests/multibranch/fixtures/multi_scm_full.yaml
+++ b/tests/multibranch/fixtures/multi_scm_full.yaml
@@ -7,6 +7,7 @@ periodic-folder-trigger: 1d
prune-dead-branches: True
number-to-keep: '10'
days-to-keep: '10'
+abort-builds: True
script-path: 'some.Jenkinsfile'
scm:
- bitbucket:
diff --git a/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml b/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml
index 8136ab90f..b8767fd17 100644
--- a/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml
+++ b/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml b/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml
index c8a0070ea..7193cf432 100644
--- a/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml
+++ b/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_bitbucket_full.xml b/tests/multibranch/fixtures/scm_bitbucket_full.xml
index 03b0c867f..3357d52bc 100644
--- a/tests/multibranch/fixtures/scm_bitbucket_full.xml
+++ b/tests/multibranch/fixtures/scm_bitbucket_full.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_bitbucket_minimal.xml b/tests/multibranch/fixtures/scm_bitbucket_minimal.xml
index 46b124eed..d1e242109 100644
--- a/tests/multibranch/fixtures/scm_bitbucket_minimal.xml
+++ b/tests/multibranch/fixtures/scm_bitbucket_minimal.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_gerrit_full.xml b/tests/multibranch/fixtures/scm_gerrit_full.xml
index c161004ea..0edb727ba 100644
--- a/tests/multibranch/fixtures/scm_gerrit_full.xml
+++ b/tests/multibranch/fixtures/scm_gerrit_full.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_gerrit_minimal.xml b/tests/multibranch/fixtures/scm_gerrit_minimal.xml
index 61c9183c6..4a7f27c11 100644
--- a/tests/multibranch/fixtures/scm_gerrit_minimal.xml
+++ b/tests/multibranch/fixtures/scm_gerrit_minimal.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_git_full.xml b/tests/multibranch/fixtures/scm_git_full.xml
index c7393ff12..5df740359 100644
--- a/tests/multibranch/fixtures/scm_git_full.xml
+++ b/tests/multibranch/fixtures/scm_git_full.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_git_minimal.xml b/tests/multibranch/fixtures/scm_git_minimal.xml
index d30a42f91..7b5c49aae 100644
--- a/tests/multibranch/fixtures/scm_git_minimal.xml
+++ b/tests/multibranch/fixtures/scm_git_minimal.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_filter_by_name_wildcard.xml b/tests/multibranch/fixtures/scm_github_filter_by_name_wildcard.xml
index ddab5699d..e9baf9807 100644
--- a/tests/multibranch/fixtures/scm_github_filter_by_name_wildcard.xml
+++ b/tests/multibranch/fixtures/scm_github_filter_by_name_wildcard.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_full.xml b/tests/multibranch/fixtures/scm_github_full.xml
index ff7d5fcb7..e5877120c 100644
--- a/tests/multibranch/fixtures/scm_github_full.xml
+++ b/tests/multibranch/fixtures/scm_github_full.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_legacy_nc.xml b/tests/multibranch/fixtures/scm_github_legacy_nc.xml
index 5dc7ff67f..591367990 100644
--- a/tests/multibranch/fixtures/scm_github_legacy_nc.xml
+++ b/tests/multibranch/fixtures/scm_github_legacy_nc.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_minimal.xml b/tests/multibranch/fixtures/scm_github_minimal.xml
index 3755cc697..af307e5fc 100644
--- a/tests/multibranch/fixtures/scm_github_minimal.xml
+++ b/tests/multibranch/fixtures/scm_github_minimal.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_named_branch_props.xml b/tests/multibranch/fixtures/scm_github_named_branch_props.xml
index 07818a90f..2d94035b7 100644
--- a/tests/multibranch/fixtures/scm_github_named_branch_props.xml
+++ b/tests/multibranch/fixtures/scm_github_named_branch_props.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml b/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml
index 33dfc1385..3e58de7ba 100644
--- a/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml
+++ b/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false
diff --git a/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml
index d700a816e..b2883c894 100644
--- a/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml
+++ b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml
@@ -26,6 +26,7 @@
true
-1
-1
+ false