Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #406 from jglick/SCMStep-JENKINS-35247
[JENKINS-35247] Moved GitStep to git-plugin
- Loading branch information
Showing
8 changed files
with
521 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2014 Jesse Glick. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.plugins.git; | ||
|
|
||
| import com.google.inject.Inject; | ||
| import hudson.Extension; | ||
| import hudson.Util; | ||
| import hudson.model.Item; | ||
| import hudson.plugins.git.BranchSpec; | ||
| import hudson.plugins.git.GitSCM; | ||
| import hudson.plugins.git.SubmoduleConfig; | ||
| import hudson.plugins.git.UserRemoteConfig; | ||
| import hudson.plugins.git.extensions.GitSCMExtension; | ||
| import hudson.plugins.git.extensions.impl.LocalBranch; | ||
| import hudson.scm.SCM; | ||
| import hudson.util.FormValidation; | ||
| import hudson.util.ListBoxModel; | ||
| import java.io.IOException; | ||
| import java.util.Collections; | ||
| import org.jenkinsci.plugins.workflow.steps.scm.SCMStep; | ||
| import org.kohsuke.stapler.AncestorInPath; | ||
| import org.kohsuke.stapler.DataBoundConstructor; | ||
| import org.kohsuke.stapler.DataBoundSetter; | ||
| import org.kohsuke.stapler.QueryParameter; | ||
|
|
||
| /** | ||
| * Runs Git using {@link GitSCM}. | ||
| */ | ||
| public final class GitStep extends SCMStep { | ||
|
|
||
| private final String url; | ||
| private String branch = "master"; | ||
| private String credentialsId; | ||
|
|
||
| @DataBoundConstructor | ||
| public GitStep(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public String getBranch() { | ||
| return branch; | ||
| } | ||
|
|
||
| public String getCredentialsId() { | ||
| return credentialsId; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setBranch(String branch) { | ||
| this.branch = branch; | ||
| } | ||
|
|
||
| @DataBoundSetter | ||
| public void setCredentialsId(String credentialsId) { | ||
| this.credentialsId = Util.fixEmpty(credentialsId); | ||
| } | ||
|
|
||
| @Override | ||
| public SCM createSCM() { | ||
| return new GitSCM(GitSCM.createRepoList(url, credentialsId), Collections.singletonList(new BranchSpec("*/" + branch)), false, Collections.<SubmoduleConfig>emptyList(), null, null, Collections.<GitSCMExtension>singletonList(new LocalBranch(branch))); | ||
| } | ||
|
|
||
| @Extension | ||
| public static final class DescriptorImpl extends SCMStepDescriptor { | ||
|
|
||
| @Inject | ||
| private UserRemoteConfig.DescriptorImpl delegate; | ||
|
|
||
| public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item project, | ||
| @QueryParameter String url) { | ||
| return delegate.doFillCredentialsIdItems(project, url); | ||
| } | ||
|
|
||
| public FormValidation doCheckUrl(@AncestorInPath Item project, | ||
| @QueryParameter String credentialsId, | ||
| @QueryParameter String value) throws IOException, InterruptedException { | ||
| return delegate.doCheckUrl(project, credentialsId, value); | ||
| } | ||
|
|
||
| @Override | ||
| public String getFunctionName() { | ||
| return "git"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDisplayName() { | ||
| return Messages.GitStep_git(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
38 changes: 38 additions & 0 deletions
38
src/main/resources/jenkins/plugins/git/GitStep/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| The MIT License | ||
| Copyright 2014 Jesse Glick. | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
|
|
||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form" xmlns:c="/lib/credentials"> | ||
| <f:entry field="url" title="Repository URL"> | ||
| <f:textbox/> | ||
| </f:entry> | ||
| <f:entry field="branch" title="Branch"> | ||
| <f:textbox default="master"/> | ||
| </f:entry> | ||
| <f:entry field="credentialsId" title="Credentials"> | ||
| <c:select/> | ||
| </f:entry> | ||
| <st:include page="config-generic.jelly" class="org.jenkinsci.plugins.workflow.steps.scm.SCMStep"/> | ||
| </j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <div> | ||
| <p> | ||
| Git step. It performs a clone from the specified repository. | ||
| </p> | ||
| <p> | ||
| Note that this step is shorthand for the generic SCM step:<pre> | ||
| checkout([$class: 'GitSCM', branches: [[name: '*/master']], | ||
| userRemoteConfigs: [[url: 'http://git-server/user/repository.git']]]) | ||
| </pre> | ||
| </p> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2015 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.plugins.git; | ||
|
|
||
| import com.gargoylesoftware.htmlunit.WebResponse; | ||
| import com.gargoylesoftware.htmlunit.util.NameValuePair; | ||
| import org.jenkinsci.plugins.workflow.steps.scm.AbstractSampleDVCSRepoRule; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| /** | ||
| * Manages a sample Git repository. | ||
| */ | ||
| public final class GitSampleRepoRule extends AbstractSampleDVCSRepoRule { | ||
|
|
||
| public void git(String... cmds) throws Exception { | ||
| run("git", cmds); | ||
| } | ||
|
|
||
| @Override | ||
| public void init() throws Exception { | ||
| run(true, tmp.getRoot(), "git", "version"); | ||
| git("init"); | ||
| write("file", ""); | ||
| git("add", "file"); | ||
| git("commit", "--message=init"); | ||
| } | ||
|
|
||
| public void notifyCommit(JenkinsRule r) throws Exception { | ||
| synchronousPolling(r); | ||
| WebResponse webResponse = r.createWebClient().goTo("git/notifyCommit?url=" + bareUrl(), "text/plain").getWebResponse(); | ||
| System.out.println(webResponse.getContentAsString()); | ||
| for (NameValuePair pair : webResponse.getResponseHeaders()) { | ||
| if (pair.getName().equals("Triggered")) { | ||
| System.out.println("Triggered: " + pair.getValue()); | ||
| } | ||
| } | ||
| r.waitUntilNoActivity(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.