Merge "Add support for 'ignore-notify' in git SCM"
This commit is contained in:
commit
6ae5c84699
jenkins_jobs/modules
tests
macros/scm
scm/fixtures
git-ignore-notify01.xmlgit-ignore-notify01.yamlgit-ignore-notify02.xmlgit-ignore-notify02.yamlgit-ignore-notify03.xmlgit-ignore-notify03.yamlgit-multiple-remotes.xmlgit-shallow-clone01.xmlgit-shallow-clone02.xmlgit-shallow-clone03.xmlgit001.xmlgitlab.xmllocal-branch001.xmlstash.xml
yamlparser/fixtures
@ -80,6 +80,7 @@ def git(self, xml_parent, data):
|
||||
:arg str reference-repo: Path of the reference repo to use during clone
|
||||
:arg str scm-name: The unique scm name for this Git SCM
|
||||
:arg bool wipe-workspace: Wipe out workspace before build
|
||||
: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
|
||||
:arg str browser-version: version of the repository browser (GitLab)
|
||||
@ -133,6 +134,7 @@ def git(self, xml_parent, data):
|
||||
('skip-tag', 'skipTag', False),
|
||||
('scm-name', 'scmName', ''),
|
||||
("shallow-clone", "useShallowClone", False),
|
||||
("ignore-notify", "ignoreNotifyCommit", False),
|
||||
]
|
||||
|
||||
choosing_strategies = {
|
||||
|
@ -43,6 +43,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
<scm class="hudson.plugins.git.GitSCM">
|
||||
<configVersion>2</configVersion>
|
||||
@ -77,6 +78,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</scms>
|
||||
</scm>
|
||||
|
@ -55,6 +55,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</scms>
|
||||
</scm>
|
||||
|
@ -41,6 +41,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
<builders/>
|
||||
<publishers/>
|
||||
|
38
tests/scm/fixtures/git-ignore-notify01.xml
Normal file
38
tests/scm/fixtures/git-ignore-notify01.xml
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<project>
|
||||
<scm class="hudson.plugins.git.GitSCM">
|
||||
<configVersion>2</configVersion>
|
||||
<userRemoteConfigs>
|
||||
<hudson.plugins.git.UserRemoteConfig>
|
||||
<name>origin</name>
|
||||
<refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
|
||||
<url>https://github.com/openstack-infra/jenkins-job-builder.git</url>
|
||||
</hudson.plugins.git.UserRemoteConfig>
|
||||
</userRemoteConfigs>
|
||||
<branches>
|
||||
<hudson.plugins.git.BranchSpec>
|
||||
<name>master</name>
|
||||
</hudson.plugins.git.BranchSpec>
|
||||
</branches>
|
||||
<excludedUsers/>
|
||||
<buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
|
||||
<disableSubmodules>false</disableSubmodules>
|
||||
<recursiveSubmodules>false</recursiveSubmodules>
|
||||
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
|
||||
<authorOrCommitter>false</authorOrCommitter>
|
||||
<clean>true</clean>
|
||||
<wipeOutWorkspace>true</wipeOutWorkspace>
|
||||
<pruneBranches>false</pruneBranches>
|
||||
<remotePoll>false</remotePoll>
|
||||
<gitTool>Default</gitTool>
|
||||
<submoduleCfg class="list"/>
|
||||
<relativeTargetDir/>
|
||||
<reference/>
|
||||
<gitConfigName/>
|
||||
<gitConfigEmail/>
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>true</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
7
tests/scm/fixtures/git-ignore-notify01.yaml
Normal file
7
tests/scm/fixtures/git-ignore-notify01.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
scm:
|
||||
- git:
|
||||
url: https://github.com/openstack-infra/jenkins-job-builder.git
|
||||
branches:
|
||||
- master
|
||||
clean: true
|
||||
ignore-notify: true
|
38
tests/scm/fixtures/git-ignore-notify02.xml
Normal file
38
tests/scm/fixtures/git-ignore-notify02.xml
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<project>
|
||||
<scm class="hudson.plugins.git.GitSCM">
|
||||
<configVersion>2</configVersion>
|
||||
<userRemoteConfigs>
|
||||
<hudson.plugins.git.UserRemoteConfig>
|
||||
<name>origin</name>
|
||||
<refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
|
||||
<url>https://github.com/openstack-infra/jenkins-job-builder.git</url>
|
||||
</hudson.plugins.git.UserRemoteConfig>
|
||||
</userRemoteConfigs>
|
||||
<branches>
|
||||
<hudson.plugins.git.BranchSpec>
|
||||
<name>master</name>
|
||||
</hudson.plugins.git.BranchSpec>
|
||||
</branches>
|
||||
<excludedUsers/>
|
||||
<buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
|
||||
<disableSubmodules>false</disableSubmodules>
|
||||
<recursiveSubmodules>false</recursiveSubmodules>
|
||||
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
|
||||
<authorOrCommitter>false</authorOrCommitter>
|
||||
<clean>true</clean>
|
||||
<wipeOutWorkspace>true</wipeOutWorkspace>
|
||||
<pruneBranches>false</pruneBranches>
|
||||
<remotePoll>false</remotePoll>
|
||||
<gitTool>Default</gitTool>
|
||||
<submoduleCfg class="list"/>
|
||||
<relativeTargetDir/>
|
||||
<reference/>
|
||||
<gitConfigName/>
|
||||
<gitConfigEmail/>
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
7
tests/scm/fixtures/git-ignore-notify02.yaml
Normal file
7
tests/scm/fixtures/git-ignore-notify02.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
scm:
|
||||
- git:
|
||||
url: https://github.com/openstack-infra/jenkins-job-builder.git
|
||||
branches:
|
||||
- master
|
||||
clean: true
|
||||
ignore-notify: false
|
38
tests/scm/fixtures/git-ignore-notify03.xml
Normal file
38
tests/scm/fixtures/git-ignore-notify03.xml
Normal file
@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<project>
|
||||
<scm class="hudson.plugins.git.GitSCM">
|
||||
<configVersion>2</configVersion>
|
||||
<userRemoteConfigs>
|
||||
<hudson.plugins.git.UserRemoteConfig>
|
||||
<name>origin</name>
|
||||
<refspec>+refs/heads/*:refs/remotes/origin/*</refspec>
|
||||
<url>https://github.com/openstack-infra/jenkins-job-builder.git</url>
|
||||
</hudson.plugins.git.UserRemoteConfig>
|
||||
</userRemoteConfigs>
|
||||
<branches>
|
||||
<hudson.plugins.git.BranchSpec>
|
||||
<name>master</name>
|
||||
</hudson.plugins.git.BranchSpec>
|
||||
</branches>
|
||||
<excludedUsers/>
|
||||
<buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/>
|
||||
<disableSubmodules>false</disableSubmodules>
|
||||
<recursiveSubmodules>false</recursiveSubmodules>
|
||||
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
|
||||
<authorOrCommitter>false</authorOrCommitter>
|
||||
<clean>true</clean>
|
||||
<wipeOutWorkspace>true</wipeOutWorkspace>
|
||||
<pruneBranches>false</pruneBranches>
|
||||
<remotePoll>false</remotePoll>
|
||||
<gitTool>Default</gitTool>
|
||||
<submoduleCfg class="list"/>
|
||||
<relativeTargetDir/>
|
||||
<reference/>
|
||||
<gitConfigName/>
|
||||
<gitConfigEmail/>
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
6
tests/scm/fixtures/git-ignore-notify03.yaml
Normal file
6
tests/scm/fixtures/git-ignore-notify03.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
scm:
|
||||
- git:
|
||||
url: https://github.com/openstack-infra/jenkins-job-builder.git
|
||||
branches:
|
||||
- master
|
||||
clean: true
|
@ -39,5 +39,6 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
||||
</project>
|
||||
|
@ -34,5 +34,6 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>true</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
||||
|
@ -33,5 +33,6 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
||||
|
@ -33,5 +33,6 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
</project>
|
||||
|
@ -36,6 +36,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
<browser class="hudson.plugins.git.browser.GithubWeb">
|
||||
<url>http://github.com/foo/example.git</url>
|
||||
</browser>
|
||||
|
@ -33,6 +33,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
<browser class="hudson.plugins.git.browser.GitLab">
|
||||
<url>https://gitlab.example.com/foo/bar/</url>
|
||||
<version>5.2</version>
|
||||
|
@ -33,6 +33,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
<localBranch>master</localBranch>
|
||||
</scm>
|
||||
</project>
|
||||
|
@ -33,6 +33,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
<browser class="hudson.plugins.git.browser.Stash">
|
||||
<url>https://stash.example.com/projects/foo/repos/bar/</url>
|
||||
</browser>
|
||||
|
@ -41,6 +41,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
<browser class="hudson.plugins.git.browser.GitWeb">
|
||||
<url>http://review.openstack.org/gitweb?p=openstack-infra/jenkins-job-builder.git</url>
|
||||
</browser>
|
||||
|
@ -41,6 +41,7 @@
|
||||
<skipTag>false</skipTag>
|
||||
<scmName/>
|
||||
<useShallowClone>false</useShallowClone>
|
||||
<ignoreNotifyCommit>false</ignoreNotifyCommit>
|
||||
</scm>
|
||||
<builders/>
|
||||
<publishers/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user