Merge "Add git submodule threads"

jenkins_jobs/modules/scm.py

@@ -322,6 +322,8 @@ def git(registry, xml_parent, data):
               during clone (optional)
             * **timeout** (`int`) - Specify a timeout (in minutes) for
               submodules operations (default 10).
+            * **threads** (`int`) - Number of parallel processes to be used when
+              updating submodules. Default is to use a single thread for submodule updates.
         * **timeout** (`str`) - Timeout for git commands in minutes (optional)
         * **use-author** (`bool`): Use author rather than committer in Jenkin's
             build changeset (default false)
@@ -675,6 +677,7 @@ def git_extensions(xml_parent, data):
             data["submodule"].get("reference-repo", "")
         )
         XML.SubElement(ext, "timeout").text = str(data["submodule"].get("timeout", 10))
+        XML.SubElement(ext, "threads").text = str(data["submodule"].get("threads", 1))
     if "timeout" in data:
         ext_name = impl_prefix + "CheckoutOption"
         if trait:

tests/macros/fixtures/scm/obj-in-scm-macro001.xml

@@ -46,6 +46,7 @@
         <parentCredentials>false</parentCredentials>
         <reference/>
         <timeout>10</timeout>
+        <threads>1</threads>
       </hudson.plugins.git.extensions.impl.SubmoduleOption>
     </extensions>
   </scm>

tests/multibranch/fixtures/scm_bitbucket_full.xml

@@ -140,6 +140,7 @@
                 <parentCredentials>true</parentCredentials>
                 <reference/>
                 <timeout>100</timeout>
+                <threads>1</threads>
               </extension>
             </jenkins.plugins.git.traits.SubmoduleOptionTrait>
             <jenkins.plugins.git.traits.CheckoutOptionTrait>

tests/multibranch/fixtures/scm_bitbucket_full.yaml

@@ -96,6 +96,7 @@ scm:
             recursive: true
             parent-credentials: true
             timeout: 100
+            threads: 1
         timeout: "100"
         skip-notifications: true
         use-author: true

tests/multibranch/fixtures/scm_git_full.xml

@@ -98,6 +98,7 @@
                 <parentCredentials>true</parentCredentials>
                 <reference/>
                 <timeout>100</timeout>
+                <threads>1</threads>
               </extension>
             </jenkins.plugins.git.traits.SubmoduleOptionTrait>
             <jenkins.plugins.git.traits.CheckoutOptionTrait>

tests/multibranch/fixtures/scm_git_full.yaml

@@ -85,6 +85,7 @@ scm:
             recursive: true
             parent-credentials: true
             timeout: 100
+            threads: 1
         timeout: "100"
         use-author: true
         wipe-workspace: true

tests/multibranch/fixtures/scm_github_full.xml

@@ -122,6 +122,7 @@
                 <parentCredentials>true</parentCredentials>
                 <reference/>
                 <timeout>100</timeout>
+                <threads>1</threads>
               </extension>
             </jenkins.plugins.git.traits.SubmoduleOptionTrait>
             <jenkins.plugins.git.traits.CheckoutOptionTrait>

tests/multibranch/fixtures/scm_github_full.yaml

@@ -96,6 +96,7 @@ scm:
             recursive: true
             parent-credentials: true
             timeout: 100
+            threads: 1
         timeout: "100"
         skip-notifications: true
         use-author: true

tests/scm/fixtures/git-submodule01.xml

@@ -29,6 +29,7 @@
         <parentCredentials>true</parentCredentials>
         <reference>/jenkins_home/.gitcache/submodules</reference>
         <timeout>15</timeout>
+        <threads>1</threads>
       </hudson.plugins.git.extensions.impl.SubmoduleOption>
       <hudson.plugins.git.extensions.impl.WipeWorkspace/>
     </extensions>

tests/scm/fixtures/git-submodule01.yaml

@@ -8,3 +8,4 @@ scm:
             parent-credentials: true
             reference-repo: /jenkins_home/.gitcache/submodules
             timeout: 15
+            threads: 1