Merge "multibranch-bitbucket: Configure server address"

jenkins_jobs/modules/project_multibranch.py

@@ -298,6 +298,7 @@ def bitbucket_scm(xml_parent, data):
 
     :arg bool discover-tags: Discovers tags on the repository.
         (default false)
+    :arg str server-url: The address of the bitbucket server. (optional)
 
     Minimal Example:
 
@@ -323,6 +324,7 @@ def bitbucket_scm(xml_parent, data):
 
     mapping_optional = [
         ('credentials-id', 'credentialsId', None),
+        ('server-url', 'serverUrl', None),
     ]
     helpers.convert_mapping_to_xml(
         source, data, mapping_optional, fail_required=False)

tests/multibranch/fixtures/scm_bitbucket_full.xml

@@ -36,6 +36,7 @@
           <repoOwner>SANDBOX</repoOwner>
           <repository>test</repository>
           <credentialsId>secret</credentialsId>
+          <serverUrl>https://bitbucket.example.com:8080</serverUrl>
           <traits>
             <com.cloudbees.jenkins.plugins.bitbucket.TagDiscoveryTrait/>
           </traits>

tests/multibranch/fixtures/scm_bitbucket_full.yaml

@@ -5,4 +5,5 @@ scm:
         credentials-id: 'secret'
         repo-owner: 'SANDBOX'
         repo: 'test'
+        server-url: https://bitbucket.example.com:8080
         discover-tags: true