From e4782b37f0cd007952a8e466f3667bd4ba8a5496 Mon Sep 17 00:00:00 2001 From: rick Date: Wed, 9 Dec 2020 13:41:01 +0800 Subject: [PATCH] Remove the specified version of jenkins plugin scm-api Signed-off-by: rick --- pkg/simple/client/devops/jenkins/internal/bitbucket.go | 2 +- pkg/simple/client/devops/jenkins/internal/git.go | 2 +- pkg/simple/client/devops/jenkins/internal/github.go | 2 +- pkg/simple/client/devops/jenkins/internal/gitlab.go | 2 +- pkg/simple/client/devops/jenkins/internal/pull_request.go | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/simple/client/devops/jenkins/internal/bitbucket.go b/pkg/simple/client/devops/jenkins/internal/bitbucket.go index 00f24aab..08022767 100644 --- a/pkg/simple/client/devops/jenkins/internal/bitbucket.go +++ b/pkg/simple/client/devops/jenkins/internal/bitbucket.go @@ -71,7 +71,7 @@ func AppendBitbucketServerSourceToEtree(source *etree.Element, gitSource *devops } if gitSource.RegexFilter != "" { regexTraits := traits.CreateElement("jenkins.scm.impl.trait.RegexSCMHeadFilterTrait") - regexTraits.CreateAttr("plugin", "scm-api@2.4.0") + regexTraits.CreateAttr("plugin", "scm-api") regexTraits.CreateElement("regex").SetText(gitSource.RegexFilter) } return diff --git a/pkg/simple/client/devops/jenkins/internal/git.go b/pkg/simple/client/devops/jenkins/internal/git.go index 0cd2dab2..cf18965f 100644 --- a/pkg/simple/client/devops/jenkins/internal/git.go +++ b/pkg/simple/client/devops/jenkins/internal/git.go @@ -48,7 +48,7 @@ func AppendGitSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3.Git if gitSource.RegexFilter != "" { regexTraits := traits.CreateElement("jenkins.scm.impl.trait.RegexSCMHeadFilterTrait") - regexTraits.CreateAttr("plugin", "scm-api@2.4.0") + regexTraits.CreateAttr("plugin", "scm-api") regexTraits.CreateElement("regex").SetText(gitSource.RegexFilter) } return diff --git a/pkg/simple/client/devops/jenkins/internal/github.go b/pkg/simple/client/devops/jenkins/internal/github.go index 32e796b6..1a4fb1e1 100644 --- a/pkg/simple/client/devops/jenkins/internal/github.go +++ b/pkg/simple/client/devops/jenkins/internal/github.go @@ -66,7 +66,7 @@ func AppendGithubSourceToEtree(source *etree.Element, githubSource *devopsv1alph } if githubSource.RegexFilter != "" { regexTraits := traits.CreateElement("jenkins.scm.impl.trait.RegexSCMHeadFilterTrait") - regexTraits.CreateAttr("plugin", "scm-api@2.4.0") + regexTraits.CreateAttr("plugin", "scm-api") regexTraits.CreateElement("regex").SetText(githubSource.RegexFilter) } return diff --git a/pkg/simple/client/devops/jenkins/internal/gitlab.go b/pkg/simple/client/devops/jenkins/internal/gitlab.go index 4f51c35b..d37ffea5 100644 --- a/pkg/simple/client/devops/jenkins/internal/gitlab.go +++ b/pkg/simple/client/devops/jenkins/internal/gitlab.go @@ -65,7 +65,7 @@ func AppendGitlabSourceToEtree(source *etree.Element, gitSource *devopsv1alpha3. } if gitSource.RegexFilter != "" { regexTraits := traits.CreateElement("jenkins.scm.impl.trait.RegexSCMHeadFilterTrait") - regexTraits.CreateAttr("plugin", "scm-api@2.4.0") + regexTraits.CreateAttr("plugin", "scm-api") regexTraits.CreateElement("regex").SetText(gitSource.RegexFilter) } return diff --git a/pkg/simple/client/devops/jenkins/internal/pull_request.go b/pkg/simple/client/devops/jenkins/internal/pull_request.go index e8001f02..fc79409f 100644 --- a/pkg/simple/client/devops/jenkins/internal/pull_request.go +++ b/pkg/simple/client/devops/jenkins/internal/pull_request.go @@ -7,6 +7,7 @@ const ( PRDiscoverTrustEveryone PRDiscoverTrust = 2 PRDiscoverTrustPermission PRDiscoverTrust = 3 PRDiscoverTrustNobody PRDiscoverTrust = 4 + PRDiscoverUnknown PRDiscoverTrust = -1 ) type GitHubPRDiscoverTrust int @@ -44,7 +45,7 @@ func (p PRDiscoverTrust) ParseFromString(prTrust string) PRDiscoverTrust { case "TrustNobody": return PRDiscoverTrustNobody default: - return -1 + return PRDiscoverUnknown } } -- GitLab