-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into shallow-clone-ui
- Loading branch information
Showing
10 changed files
with
189 additions
and
23 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
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
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
125 changes: 125 additions & 0 deletions
125
src/test/java/hudson/plugins/git/extensions/impl/PruneStaleTagPipelineTest.java
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,125 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright (c) 2020 Nikolas Falco | ||
| * | ||
| * 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 hudson.plugins.git.extensions.impl; | ||
|
|
||
| import java.io.File; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import org.apache.commons.io.FileUtils; | ||
| import org.jenkinsci.plugins.gitclient.GitClient; | ||
| import org.jenkinsci.plugins.gitclient.TestCliGitAPIImpl; | ||
| import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition; | ||
| import org.jenkinsci.plugins.workflow.job.WorkflowJob; | ||
| import org.jenkinsci.plugins.workflow.job.WorkflowRun; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
| import org.jvnet.hudson.test.Issue; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| import hudson.EnvVars; | ||
| import hudson.FilePath; | ||
| import hudson.Functions; | ||
| import hudson.model.Result; | ||
| import hudson.model.TaskListener; | ||
| import hudson.util.LogTaskListener; | ||
|
|
||
| public class PruneStaleTagPipelineTest { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder fileRule = new TemporaryFolder(); | ||
| @Rule | ||
| public JenkinsRule j = new JenkinsRule(); | ||
|
|
||
| private TaskListener listener; | ||
|
|
||
| @Before | ||
| public void setup() throws Exception { | ||
| listener = new LogTaskListener(Logger.getLogger("prune tags"), Level.FINEST); | ||
| } | ||
|
|
||
| @Issue("JENKINS-61869") | ||
| @Test | ||
| public void verify_that_local_tag_is_pruned_when_not_exist_on_remote_using_pipeline() throws Exception { | ||
| File remoteRepo = fileRule.newFolder("remote"); | ||
|
|
||
| // create a remote repository without one tag | ||
| GitClient remoteClient = initRepository(remoteRepo); | ||
| String tagName = "tag"; | ||
| String tagComment = "tag comment"; | ||
| remoteClient.tag(tagName, tagComment); | ||
|
|
||
| WorkflowJob job = j.jenkins.createProject(WorkflowJob.class, "pruneTags"); | ||
|
|
||
| FilePath workspace = j.jenkins.getWorkspaceFor(job); | ||
| String remoteURL = "file://" + remoteRepo.toURI().getPath(); | ||
|
|
||
| job.setDefinition(new CpsFlowDefinition("" | ||
| + " node {\n" | ||
| + " checkout([$class: 'GitSCM'," | ||
| + " branches: [[name: '*/master']]," | ||
| + " doGenerateSubmoduleConfigurations: false," | ||
| + " extensions: [pruneTags(true)]," | ||
| + " submoduleCfg: []," | ||
| + " userRemoteConfigs: [[url: '" + remoteURL + "']]" | ||
| + " ])" | ||
| + " }\n", true)); | ||
|
|
||
| // first run clone the repository | ||
| WorkflowRun r = job.scheduleBuild2(0).waitForStart(); | ||
| j.assertBuildStatus(Result.SUCCESS, j.waitForCompletion(r)); | ||
|
|
||
| // remove tag on remote, tag remains on local cloned repository | ||
| remoteClient.deleteTag(tagName); | ||
|
|
||
| // second run it should remove stale tags | ||
| r = job.scheduleBuild2(0).waitForStart(); | ||
| j.assertBuildStatus(Result.SUCCESS, j.waitForCompletion(r)); | ||
|
|
||
| GitClient localClient = newGitClient(new File(workspace.getRemote())); | ||
| Assert.assertFalse("local tag has not been pruned", localClient.tagExists(tagName)); | ||
| } | ||
|
|
||
| private GitClient newGitClient(File localRepo) { | ||
| String gitExe = Functions.isWindows() ? "git.exe" : "git"; | ||
| GitClient localClient = new TestCliGitAPIImpl(gitExe, localRepo, listener, new EnvVars()); | ||
| return localClient; | ||
| } | ||
|
|
||
| private GitClient initRepository(File workspace) throws Exception { | ||
| GitClient remoteClient = newGitClient(workspace); | ||
| remoteClient.init(); | ||
|
|
||
| FileUtils.touch(new File(workspace, "test")); | ||
| remoteClient.add("test"); | ||
|
|
||
| remoteClient.commit("initial commit"); | ||
| return remoteClient; | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.