Merge "SCM repo: add force-sync option"

This commit is contained in:
Jenkins 2016-02-25 18:58:53 +00:00 committed by Gerrit Code Review
commit 3954224c78
5 changed files with 7 additions and 0 deletions
jenkins_jobs/modules
tests

@ -579,6 +579,8 @@ def repo(parser, xml_parent, data):
(default true)
:arg bool quiet: Make repo more quiet
(default true)
:arg bool force-sync: Continue sync even if a project fails to sync
(default false)
:arg str local-manifest: Contents of .repo/local_manifest.xml, written
prior to calling sync (optional)
@ -607,6 +609,7 @@ def repo(parser, xml_parent, data):
("jobs", 'jobs', 0),
("current-branch", 'currentBranch', True),
("quiet", 'quiet', True),
("force-sync", 'forceSync', False),
("local-manifest", 'localManifest', ''),
]

@ -21,6 +21,7 @@
<jobs>3</jobs>
<currentBranch>false</currentBranch>
<quiet>false</quiet>
<forceSync>false</forceSync>
</scm>
<scm class="hudson.plugins.git.GitSCM">
<configVersion>2</configVersion>

@ -12,6 +12,7 @@
jobs: 3
current-branch: false
quiet: false
force-sync: false
- scm:
name: second-scm

@ -11,6 +11,7 @@
<jobs>3</jobs>
<currentBranch>false</currentBranch>
<quiet>false</quiet>
<forceSync>true</forceSync>
<localManifest>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;
&lt;manifest&gt;
&lt;project path=&quot;external/project&quot; name=&quot;org/project&quot;

@ -10,6 +10,7 @@ scm:
jobs: 3
current-branch: false
quiet: false
force-sync: true
local-manifest: |
<?xml version="1.0" encoding="UTF-8"?>
<manifest>