From d5285667a5f78c251646b34cc4ccc5eb786dc703 Mon Sep 17 00:00:00 2001 From: Guixian Zhang Date: Wed, 12 May 2021 16:00:10 +0800 Subject: [PATCH] =?UTF-8?q?Global=20pipeline=20libraries=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractWebHookTriggerHandler.java | 21 +++---------------- .../note/NoteHookTriggerHandlerImpl.java | 2 +- .../PipelineHookTriggerHandlerImpl.java | 2 +- .../PullRequestHookTriggerHandlerImpl.java | 2 +- .../push/PushHookTriggerHandlerImpl.java | 2 +- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java b/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java index d86220e..b3ce046 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java @@ -15,7 +15,6 @@ import hudson.scm.SCM; import jenkins.model.ParameterizedJobMixIn; import jenkins.triggers.SCMTriggerItem; import net.karneim.pojobuilder.GeneratePojoBuilder; -import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.URIish; import org.jenkinsci.plugins.workflow.job.WorkflowRun; @@ -23,8 +22,6 @@ import javax.servlet.ServletException; import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; @@ -90,22 +87,10 @@ public abstract class AbstractWebHookTriggerHandler implement protected abstract BuildStatusUpdate retrieveBuildStatusUpdate(H hook); - protected URIish retrieveUrIish(WebHook hook, GitSCM gitSCM) { - if (hook.getRepository() == null || gitSCM == null) { - return null; - } + protected URIish retrieveUrIish(WebHook hook) { try { - Set set = new HashSet<>(); - set.add(new URIish(hook.getRepository().getUrl())); - set.add(new URIish(hook.getRepository().getGitHttpUrl())); - set.add(new URIish(hook.getRepository().getGitSshUrl())); - // uri 需与当前项目仓库个url一致，避免触发多个构建 - for (RemoteConfig remote : gitSCM.getRepositories()) { - for (URIish remoteURL : remote.getURIs()) { - if (set.contains(remoteURL)) { - return remoteURL; - } - } + if (hook.getRepository() != null) { + return new URIish(hook.getRepository().getUrl()); } } catch (URISyntaxException e) { LOGGER.log(Level.WARNING, "could not parse URL"); diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java index 2713762..7da6aa0 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java @@ -220,7 +220,7 @@ class NoteHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler if (gitSCM == null) { return new RevisionParameterAction(retrieveRevisionToBuild(hook)); } - URIish urIish = retrieveUrIish(hook, gitSCM); + URIish urIish = retrieveUrIish(hook); // webhook与git源码管理仓库对不上 if (urIish == null) { return new RevisionParameterAction(retrieveRevisionToBuild2(hook)); diff --git a/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java b/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java index 247307e..c091a81 100644 --- a/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java +++ b/src/main/java/com/gitee/jenkins/trigger/handler/pipeline/PipelineHookTriggerHandlerImpl.java @@ -133,7 +133,7 @@ class PipelineHookTriggerHandlerImpl extends AbstractWebHookTriggerHandler @Override protected RevisionParameterAction createRevisionParameter(PushHook hook, GitSCM gitSCM) throws NoRevisionToBuildException { - return new RevisionParameterAction(retrieveRevisionToBuild(hook, gitSCM), retrieveUrIish(hook, gitSCM)); + return new RevisionParameterAction(retrieveRevisionToBuild(hook, gitSCM), retrieveUrIish(hook)); } @Override -- Gitee