Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[JENKINS-26587] Fix multi-scm checkout sporadic failures
- add test for the bug - fix bug by excluding revisions which didn't come from the specific repository being evaluated - remote URL is stored in RevisionParameterAction - extend TestGitRepo to return commit SHA1 for the committed file - commit notification log message no longer contains "null" when no repository URL is supplied
- Loading branch information
1 parent
c84fc2c
commit 1d2fb9a41e71607321c2b4838e72d37ab1cd9fbe
Showing
with
284 additions
and 18 deletions.
- +8 −1 src/main/java/hudson/plugins/git/GitSCM.java
- +3 −1 src/main/java/hudson/plugins/git/GitStatus.java
- +38 −2 src/main/java/hudson/plugins/git/RevisionParameterAction.java
- +119 −0 src/test/java/hudson/plugins/git/GitStatusMultipleSCMTest.java
- +66 −0 src/test/java/hudson/plugins/git/RevisionParameterActionRemoteUrlTest.java
- +50 −14 src/test/java/hudson/plugins/git/TestGitRepo.java
| @@ -0,0 +1,119 @@ | ||
| package hudson.plugins.git; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.jenkinsci.plugins.multiplescms.MultiSCM; | ||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
| import org.jvnet.hudson.test.CaptureEnvironmentBuilder; | ||
| import org.jvnet.hudson.test.Issue; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
|
|
||
| import hudson.model.AbstractBuild; | ||
| import hudson.model.AbstractProject; | ||
| import hudson.model.FreeStyleProject; | ||
| import hudson.model.TaskListener; | ||
| import hudson.plugins.git.extensions.GitSCMExtension; | ||
| import hudson.scm.SCM; | ||
| import hudson.triggers.SCMTrigger; | ||
| import hudson.util.StreamTaskListener; | ||
|
|
||
| import javax.servlet.http.HttpServletRequest; | ||
|
|
||
| import static org.hamcrest.Matchers.greaterThan; | ||
| import static org.junit.Assert.assertNotNull; | ||
| import static org.junit.Assert.assertThat; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| public class GitStatusMultipleSCMTest { | ||
|
|
||
| @Rule public JenkinsRule r = new JenkinsRule(); | ||
| @Rule public TemporaryFolder tmp = new TemporaryFolder(); | ||
|
|
||
| private GitStatus gitStatus; | ||
| private TestGitRepo repo0; | ||
| private TestGitRepo repo1; | ||
| private FreeStyleProject testProject; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| gitStatus = new GitStatus(); | ||
| TaskListener listener = StreamTaskListener.fromStderr(); | ||
| repo0 = new TestGitRepo("repo0", tmp.newFolder(), listener); | ||
| repo1 = new TestGitRepo("repo1", tmp.newFolder(), listener); | ||
| testProject = r.createFreeStyleProject(); | ||
| } | ||
|
|
||
| @Test | ||
| @Issue("JENKINS-26587") | ||
| public void commitNotificationIsPropagatedOnlyToSourceRepository() throws Exception { | ||
| setupProject("master", false); | ||
|
|
||
| repo0.commit("repo0", repo1.johnDoe, "repo0 commit 1"); | ||
| final String repo1sha1 = repo1.commit("repo1", repo1.janeDoe, "repo1 commit 1"); | ||
|
|
||
| this.gitStatus.doNotifyCommit(requestWithoutParameters(), repo1.remoteConfigs().get(0).getUrl(), null, repo1sha1); | ||
| assertTrue("expected a build start on notify", r.isSomethingHappening()); | ||
|
|
||
| r.waitUntilNoActivity(); | ||
|
|
||
| final List<AbstractProject> projects = r.getInstance().getAllItems(AbstractProject.class); | ||
| assertThat("should contain previously created project", projects.size(), greaterThan(0)); | ||
|
|
||
| for (AbstractProject project : projects) { | ||
| final AbstractBuild lastBuild = project.getLastBuild(); | ||
| assertNotNull("one build should've been built after notification", lastBuild); | ||
| r.assertBuildStatusSuccess(lastBuild); | ||
| } | ||
| } | ||
|
|
||
| private HttpServletRequest requestWithoutParameters() { | ||
| return mock(HttpServletRequest.class); | ||
| } | ||
|
|
||
| private SCMTrigger setupProject(String branchString, boolean ignoreNotifyCommit) throws Exception { | ||
| SCMTrigger trigger = new SCMTrigger("", ignoreNotifyCommit); | ||
| setupProject(branchString, trigger); | ||
| return trigger; | ||
| } | ||
|
|
||
| private void setupProject(String branchString, SCMTrigger trigger) throws Exception { | ||
| List<BranchSpec> branch = Collections.singletonList(new BranchSpec(branchString)); | ||
|
|
||
| SCM repo0Scm = new GitSCM( | ||
| repo0.remoteConfigs(), | ||
| branch, | ||
| false, | ||
| Collections.<SubmoduleConfig>emptyList(), | ||
| null, | ||
| null, | ||
| Collections.<GitSCMExtension>emptyList()); | ||
|
|
||
| SCM repo1Scm = new GitSCM( | ||
| repo1.remoteConfigs(), | ||
| branch, | ||
| false, | ||
| Collections.<SubmoduleConfig>emptyList(), | ||
| null, | ||
| null, | ||
| Collections.<GitSCMExtension>emptyList()); | ||
|
|
||
| List<SCM> testScms = new ArrayList<SCM>(); | ||
| testScms.add(repo0Scm); | ||
| testScms.add(repo1Scm); | ||
|
|
||
| MultiSCM scm = new MultiSCM(testScms); | ||
|
|
||
| testProject.setScm(scm); | ||
| testProject.getBuildersList().add(new CaptureEnvironmentBuilder()); | ||
|
|
||
| if (trigger != null) { | ||
| testProject.addTrigger(trigger); | ||
| } | ||
| } | ||
| } |
| @@ -0,0 +1,66 @@ | ||
| package hudson.plugins.git; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.jgit.transport.RemoteConfig; | ||
| import org.eclipse.jgit.transport.URIish; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public class RevisionParameterActionRemoteUrlTest { | ||
|
|
||
| @Test | ||
| public void noRemoteURLSet() throws Exception { | ||
| RevisionParameterAction target = new RevisionParameterAction("sha1"); | ||
| URIish remoteURL = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| assertTrue("should always return true when no remote set", target.canOriginateFrom(remotes(remoteURL))); | ||
| } | ||
|
|
||
| @Test | ||
| public void remoteURLSetButDoesntMatch() throws Exception { | ||
| URIish actionURL = new URIish("https://github.com/jenkinsci/multiple-scms-plugin.git"); | ||
| RevisionParameterAction target = new RevisionParameterAction("sha1", actionURL); | ||
|
|
||
| URIish remoteURL = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| assertFalse("should return false on different remotes", target.canOriginateFrom(remotes(remoteURL))); | ||
| } | ||
|
|
||
| @Test | ||
| public void remoteURLSetAndMatches() throws Exception { | ||
| URIish actionURL = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| RevisionParameterAction target = new RevisionParameterAction("sha1", actionURL); | ||
|
|
||
| URIish remoteURL = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| assertTrue("should return true on same remotes", target.canOriginateFrom(remotes(remoteURL))); | ||
| } | ||
|
|
||
| @Test | ||
| public void multipleRemoteURLsSetAndOneMatches() throws Exception { | ||
| URIish actionURL = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| RevisionParameterAction target = new RevisionParameterAction("sha1", actionURL); | ||
|
|
||
| URIish remoteURL1 = new URIish("https://github.com/jenkinsci/multiple-scms-plugin.git"); | ||
| URIish remoteURL2 = new URIish("https://github.com/jenkinsci/git-plugin.git"); | ||
| assertTrue("should return true when any remote matches", target.canOriginateFrom(remotes(remoteURL1, remoteURL2))); | ||
| } | ||
|
|
||
| private List<RemoteConfig> remotes(URIish... remoteURLs) { | ||
| List<RemoteConfig> result = new ArrayList<RemoteConfig>(); | ||
| for (URIish remoteURL : remoteURLs) { | ||
| result.add(remote(remoteURL)); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private RemoteConfig remote(URIish remoteURL) { | ||
| RemoteConfig result = mock(RemoteConfig.class); | ||
| when(result.getURIs()).thenReturn(Arrays.asList(remoteURL)); | ||
| return result; | ||
| } | ||
| } |
Oops, something went wrong.