From 50dd589966a77090339466ca378d0d92223cbf73 Mon Sep 17 00:00:00 2001
From: Johannes Carlsson <johannes.carlsson@acconeer.com>
Date: Mon, 18 Nov 2024 13:39:31 +0100
Subject: [PATCH] Fix "abort-builds" for WorkflowMultiBranchProject

"abort-builds" must be present in job_contents_keys in order for it to
properly work.

Also add a multibranch test for the yamlparser that will verify that
this works properly.

Change-Id: Ide9cd0f89a19002977cdcc2dfb9cd873e7d16945
---
 jenkins_jobs/defaults.py                      |  1 +
 .../job_fixtures/multi_scm_full.xml           | 54 +++++++++++++++++++
 .../job_fixtures/multi_scm_full.yaml          | 13 +++++
 3 files changed, 68 insertions(+)
 create mode 100644 tests/yamlparser/job_fixtures/multi_scm_full.xml
 create mode 100644 tests/yamlparser/job_fixtures/multi_scm_full.yaml

diff --git a/jenkins_jobs/defaults.py b/jenkins_jobs/defaults.py
index 913fbc0d7..227f20ae5 100644
--- a/jenkins_jobs/defaults.py
+++ b/jenkins_jobs/defaults.py
@@ -79,6 +79,7 @@ job_contents_keys = {
     "prune-dead-branches",
     "days-to-keep",
     "number-to-keep",
+    "abort-builds",
     "periodic-folder-trigger",
     # Pipeline.
     "dsl",
diff --git a/tests/yamlparser/job_fixtures/multi_scm_full.xml b/tests/yamlparser/job_fixtures/multi_scm_full.xml
new file mode 100644
index 000000000..bef1e8498
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/multi_scm_full.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch">
+  <properties/>
+  <views>
+    <hudson.model.AllView>
+      <name>All</name>
+      <filterExecutors>false</filterExecutors>
+      <filterQueue>false</filterQueue>
+      <properties class="hudson.model.View$PropertyList"/>
+      <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../../.."/>
+    </hudson.model.AllView>
+  </views>
+  <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
+  <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api">
+    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+  </folderViews>
+  <healthMetrics>
+    <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder">
+      <nonRecursive>false</nonRecursive>
+    </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
+  </healthMetrics>
+  <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api">
+    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+  </icon>
+  <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder">
+    <pruneDeadBranches>true</pruneDeadBranches>
+    <daysToKeep>10</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <abortBuilds>true</abortBuilds>
+  </orphanedItemStrategy>
+  <triggers>
+    <com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder">
+      <spec>H H * * *</spec>
+      <interval>86400000</interval>
+    </com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
+  </triggers>
+  <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api">
+    <data/>
+    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+  </sources>
+  <factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory">
+    <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/>
+    <scriptPath>some.Jenkinsfile</scriptPath>
+  </factory>
+  <actions/>
+  <description>Workflow demo&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+  <publishers/>
+  <buildWrappers/>
+</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject>
diff --git a/tests/yamlparser/job_fixtures/multi_scm_full.yaml b/tests/yamlparser/job_fixtures/multi_scm_full.yaml
new file mode 100644
index 000000000..e4ddeff41
--- /dev/null
+++ b/tests/yamlparser/job_fixtures/multi_scm_full.yaml
@@ -0,0 +1,13 @@
+- job:
+    name: 'demo-multibranch-multi-scm-full'
+    description: 'Workflow demo'
+
+    project-type: multibranch
+
+    periodic-folder-trigger: 1d
+    prune-dead-branches: True
+    number-to-keep: '10'
+    days-to-keep: '10'
+    abort-builds: True
+    script-path: 'some.Jenkinsfile'
+    scm: []