jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "Update SCM Wipe workspace to use extensions style"

This commit is contained in:
Jenkins 2015-02-04 03:04:12 +00:00 committed by Gerrit Code Review
parent 12ff698fe9 d7c37c89a8
commit d679033a1e
25 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins_jobs/modules/scm.py
View File

@ -89,7 +89,6 @@ remoteName/\*')
:arg str reference-repo: Path of the reference repo to use during clone
(optional)
:arg str scm-name: The unique scm name for this Git SCM (optional)
:arg bool wipe-workspace: Wipe out workspace before build (default true)
:arg bool ignore-notify: Ignore notifyCommit URL accesses (default false)
:arg str browser: what repository browser to use (default '(Auto)')
:arg str browser-url: url for the repository browser (required if browser
@ -127,6 +126,8 @@ remoteName/\*')
submodules operations (default: 10).
:arg str timeout: Timeout for git commands in minutes (optional)
:arg bool wipe-workspace: Wipe out workspace before build
(default true)
:browser values:
:auto:
@ -294,6 +295,11 @@ remoteName/\*')
'hudson.plugins.git.extensions.impl.'
'CheckoutOption')
XML.SubElement(co, 'timeout').text = str(data['timeout'])
# By default we wipe the workspace
wipe_workspace = str(data.get('wipe-workspace', True)).lower()
if wipe_workspace == 'true':
ext_name = 'hudson.plugins.git.extensions.impl.WipeWorkspace'
ext = XML.SubElement(exts_node, ext_name)
browser = data.get('browser', 'auto')
browserdict = {'auto': 'auto',

4
tests/duplicates/fixtures/allow_duplicates001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

4
tests/duplicates/fixtures/allow_macros001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

4
tests/duplicates/fixtures/allow_projects001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

4
tests/duplicates/fixtures/allow_templates001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

8
tests/duplicates/fixtures/duplicates001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>
@ -92,7 +94,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

8
tests/duplicates/fixtures/duplicates002.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>
@ -92,7 +94,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

8
tests/macros/scm/multi-scms001.xml
View File

@ -44,7 +44,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<scm class="hudson.plugins.git.GitSCM">
<configVersion>2</configVersion>
@ -80,7 +82,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</scms>
</scm>

4
tests/macros/scm/multi-scms002.xml
View File

@ -56,7 +56,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</scms>
</scm>

4
tests/macros/scm/scm002.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>

4
tests/scm/fixtures/git-ignore-notify01.xml
View File

@ -34,6 +34,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>true</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-ignore-notify02.xml
View File

@ -34,6 +34,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-ignore-notify03.xml
View File

@ -34,6 +34,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-multiple-remotes.xml
View File

@ -40,6 +40,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-shallow-clone01.xml
View File

@ -35,6 +35,8 @@
<scmName/>
<useShallowClone>true</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-shallow-clone02.xml
View File

@ -34,6 +34,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/git-shallow-clone03.xml
View File

@ -34,6 +34,8 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

1
tests/scm/fixtures/git-submodule01.xml
View File

@ -39,6 +39,7 @@
<trackingSubmodules>true</trackingSubmodules>
<timeout>15</timeout>
</hudson.plugins.git.extensions.impl.SubmoduleOption>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

1
tests/scm/fixtures/git001.xml
View File

@ -41,6 +41,7 @@
<hudson.plugins.git.extensions.impl.CheckoutOption>
<timeout>20</timeout>
</hudson.plugins.git.extensions.impl.CheckoutOption>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
<browser class="hudson.plugins.git.browser.GithubWeb">
<url>http://github.com/foo/example.git</url>

1
tests/scm/fixtures/git002.xml
View File

@ -47,6 +47,7 @@
<hudson.plugins.git.extensions.impl.CheckoutOption>
<timeout>20</timeout>
</hudson.plugins.git.extensions.impl.CheckoutOption>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
<browser class="hudson.plugins.git.browser.GithubWeb">
<url>http://github.com/foo/example.git</url>

4
tests/scm/fixtures/gitlab.xml
View File

@ -34,7 +34,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
<browser class="hudson.plugins.git.browser.GitLab">
<url>https://gitlab.example.com/foo/bar/</url>
<version>5.2</version>

4
tests/scm/fixtures/local-branch001.xml
View File

@ -35,6 +35,8 @@
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<localBranch>master</localBranch>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
</project>

4
tests/scm/fixtures/stash.xml
View File

@ -34,7 +34,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
<browser class="hudson.plugins.git.browser.Stash">
<url>https://stash.example.com/projects/foo/repos/bar/</url>
</browser>

4
tests/yamlparser/fixtures/complete001.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
<browser class="hudson.plugins.git.browser.GitWeb">
<url>http://review.openstack.org/gitweb?p=openstack-infra/jenkins-job-builder.git</url>
</browser>

4
tests/yamlparser/fixtures/scm_remote_deep_bug.xml
View File

@ -42,7 +42,9 @@
<scmName/>
<useShallowClone>false</useShallowClone>
<ignoreNotifyCommit>false</ignoreNotifyCommit>
<extensions/>
<extensions>
<hudson.plugins.git.extensions.impl.WipeWorkspace/>
</extensions>
</scm>
<builders/>
<publishers/>