jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Add support for abort-builds"

Browse Source
changes/72/871572/1
Zuul 2 months ago committed by Gerrit Code Review
parent d9f6b1ffbb 76cc236d8a
commit 47f99b23a2
18 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
jenkins_jobs/modules/project_multibranch.py
Unescape View File

@ -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)

1
tests/multibranch/fixtures/multi_scm_full.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>10</daysToKeep>
<numToKeep>10</numToKeep>
<abortBuilds>true</abortBuilds>
</orphanedItemStrategy>
<triggers>
<com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder">

1
tests/multibranch/fixtures/multi_scm_full.yaml
Unescape View File

@ -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:

1
tests/multibranch/fixtures/multibranch_defaults_id_mode.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/multibranch_defaults_path_mode.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_bitbucket_full.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_bitbucket_minimal.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_gerrit_full.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_gerrit_minimal.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_git_full.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_git_minimal.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_filter_by_name_wildcard.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_full.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_legacy_nc.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_minimal.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_named_branch_props.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

1
tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml
Unescape View File

@ -26,6 +26,7 @@
<pruneDeadBranches>true</pruneDeadBranches>
<daysToKeep>-1</daysToKeep>
<numToKeep>-1</numToKeep>
<abortBuilds>false</abortBuilds>
</orphanedItemStrategy>
<triggers/>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">

Write Preview
Loading…
Cancel
Save