Add 'skip-initial-build' to project multibranch

Adds support for the skip initial build option added by
https://github.com/jenkinsci/basic-branch-build-strategies-plugin/pull/4.

Change-Id: I903de7605fa1f0e3ada027ada07a7972d2ca9603

9 files changed, 16 insertions, 0 deletions

diff --git a/jenkins_jobs/modules/project_multibranch.py b/jenkins_jobs/modules/project_multibranch.py
index 207594f0..a563f24f 100644
--- a/jenkins_jobs/modules/project_multibranch.py
+++ b/jenkins_jobs/modules/project_multibranch.py
@@ -1025,6 +1025,8 @@ def build_strategies(xml_parent, data):
                 (optional, default false)
         * **regular-branches** (bool): Builds regular branches whenever a
             change is detected. (optional, default None)
+        * **skip-initial-build** (bool): Skip initial build on first branch
+            indexing. (optional, default None)
         * **named-branches** (list): Builds named branches whenever a change
           is detected.
 
@@ -1079,6 +1081,12 @@ def build_strategies(xml_parent, data):
                 'plugin': 'basic-branch-build-strategies',
             })
 
+        if bbs_list.get('skip-initial-build', False):
+            XML.SubElement(bbs, ''.join([basic_build_strategies,
+            '.SkipInitialBuildOnFirstBranchIndexing']), {
+                'plugin': 'basic-branch-build-strategies',
+            })
+
         if 'change-request' in bbs_list:
             cr = bbs_list['change-request']
             cr_elem = XML.SubElement(bbs, ''.join([basic_build_strategies,
diff --git a/tests/multibranch/fixtures/scm_bitbucket_full.xml b/tests/multibranch/fixtures/scm_bitbucket_full.xml
index 3a32f7c1..19a0b895 100644
--- a/tests/multibranch/fixtures/scm_bitbucket_full.xml
+++ b/tests/multibranch/fixtures/scm_bitbucket_full.xml
@@ -130,6 +130,7 @@
             <ignoreTargetOnlyChanges>false</ignoreTargetOnlyChanges>
           </jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
           <jenkins.branch.buildstrategies.basic.BranchBuildStrategyImpl plugin="basic-branch-build-strategies"/>
+          <jenkins.branch.buildstrategies.basic.SkipInitialBuildOnFirstBranchIndexing plugin="basic-branch-build-strategies"/>
           <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl plugin="basic-branch-build-strategies">
             <filters>
               <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
diff --git a/tests/multibranch/fixtures/scm_bitbucket_full.yaml b/tests/multibranch/fixtures/scm_bitbucket_full.yaml
index f203fb6e..06c7ece4 100644
--- a/tests/multibranch/fixtures/scm_bitbucket_full.yaml
+++ b/tests/multibranch/fixtures/scm_bitbucket_full.yaml
@@ -32,6 +32,7 @@ scm:
                 ignore-target-only-changes: true
             - change-request: {}
             - regular-branches: true
+            - skip-initial-build: true
             - named-branches:
                 - exact-name:
                     name: 'test'
diff --git a/tests/multibranch/fixtures/scm_gerrit_full.xml b/tests/multibranch/fixtures/scm_gerrit_full.xml
index 5ba878b0..04c59aec 100644
--- a/tests/multibranch/fixtures/scm_gerrit_full.xml
+++ b/tests/multibranch/fixtures/scm_gerrit_full.xml
@@ -75,6 +75,7 @@
             <ignoreTargetOnlyChanges>false</ignoreTargetOnlyChanges>
           </jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
           <jenkins.branch.buildstrategies.basic.BranchBuildStrategyImpl plugin="basic-branch-build-strategies"/>
+          <jenkins.branch.buildstrategies.basic.SkipInitialBuildOnFirstBranchIndexing plugin="basic-branch-build-strategies"/>
           <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl plugin="basic-branch-build-strategies">
             <filters>
               <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
diff --git a/tests/multibranch/fixtures/scm_gerrit_full.yaml b/tests/multibranch/fixtures/scm_gerrit_full.yaml
index 36040cb5..29fb7c86 100644
--- a/tests/multibranch/fixtures/scm_gerrit_full.yaml
+++ b/tests/multibranch/fixtures/scm_gerrit_full.yaml
@@ -20,6 +20,7 @@ scm:
                 ignore-target-only-changes: true
             - change-request: {}
             - regular-branches: true
+            - skip-initial-build: true
             - named-branches:
                 - exact-name:
                     name: 'test'
diff --git a/tests/multibranch/fixtures/scm_git_full.xml b/tests/multibranch/fixtures/scm_git_full.xml
index 837f0e55..77c4c435 100644
--- a/tests/multibranch/fixtures/scm_git_full.xml
+++ b/tests/multibranch/fixtures/scm_git_full.xml
@@ -107,6 +107,7 @@
             <ignoreTargetOnlyChanges>false</ignoreTargetOnlyChanges>
           </jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
           <jenkins.branch.buildstrategies.basic.BranchBuildStrategyImpl plugin="basic-branch-build-strategies"/>
+          <jenkins.branch.buildstrategies.basic.SkipInitialBuildOnFirstBranchIndexing plugin="basic-branch-build-strategies"/>
           <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl plugin="basic-branch-build-strategies">
             <filters>
               <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
diff --git a/tests/multibranch/fixtures/scm_git_full.yaml b/tests/multibranch/fixtures/scm_git_full.yaml
index 5e2a28f5..3454f5b0 100644
--- a/tests/multibranch/fixtures/scm_git_full.yaml
+++ b/tests/multibranch/fixtures/scm_git_full.yaml
@@ -22,6 +22,7 @@ scm:
                 ignore-target-only-changes: true
             - change-request: {}
             - regular-branches: true
+            - skip-initial-build: true
             - named-branches:
                 - exact-name:
                     name: 'test'
diff --git a/tests/multibranch/fixtures/scm_github_full.xml b/tests/multibranch/fixtures/scm_github_full.xml
index cc4efcc1..208c0abb 100644
--- a/tests/multibranch/fixtures/scm_github_full.xml
+++ b/tests/multibranch/fixtures/scm_github_full.xml
@@ -122,6 +122,7 @@
             <ignoreTargetOnlyChanges>false</ignoreTargetOnlyChanges>
           </jenkins.branch.buildstrategies.basic.ChangeRequestBuildStrategyImpl>
           <jenkins.branch.buildstrategies.basic.BranchBuildStrategyImpl plugin="basic-branch-build-strategies"/>
+          <jenkins.branch.buildstrategies.basic.SkipInitialBuildOnFirstBranchIndexing plugin="basic-branch-build-strategies"/>
           <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl plugin="basic-branch-build-strategies">
             <filters>
               <jenkins.branch.buildstrategies.basic.NamedBranchBuildStrategyImpl_-ExactNameFilter>
diff --git a/tests/multibranch/fixtures/scm_github_full.yaml b/tests/multibranch/fixtures/scm_github_full.yaml
index a45ecb65..842747b6 100644
--- a/tests/multibranch/fixtures/scm_github_full.yaml
+++ b/tests/multibranch/fixtures/scm_github_full.yaml
@@ -28,6 +28,7 @@ scm:
                 ignore-target-only-changes: true
             - change-request: {}
             - regular-branches: true
+            - skip-initial-build: true
             - named-branches:
                 - exact-name:
                     name: 'test'