From bb78773b9d5aae7928d63e9af1f14dbb4a342202 Mon Sep 17 00:00:00 2001 From: AniketNS Date: Sat, 30 Dec 2023 16:14:59 +0530 Subject: [PATCH 1/4] Revert "[maven-release-plugin] prepare for next development iteration" This reverts commit 8389cbc3a8ac2218ca2b26980dc12e0101849c01. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 34a9f632c..16d63a337 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ gitlab-plugin - ${revision}${changelist} + 1.7.18 hpi GitLab Plugin https://github.com/jenkinsci/${project.artifactId} @@ -32,7 +32,7 @@ scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git - ${scmTag} + gitlab-plugin-1.7.18 https://github.com/${gitHubRepo} @@ -50,7 +50,7 @@ - 1.7.19 + 1.7.17 -SNAPSHOT 2.387.3 Max From 84556ebeb061ac4fe56e908930bc857bfaca0b45 Mon Sep 17 00:00:00 2001 From: AniketNS Date: Sat, 30 Dec 2023 16:18:32 +0530 Subject: [PATCH 2/4] Made some changes in README.md for gitlab triggers --- README.md | 66 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a61d0cc13..f2b8a0181 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,22 @@ properties([ branchFilterType: "NameBasedFilter", includeBranchesSpec: "release/qat", excludeBranchesSpec: "", + triggerOnBranchDeleteRequest: true, + triggerOnlyIfNewCommitsPushed: false, + triggerOnPipelineEvent: false, + triggerOnAcceptedMergeRequest: true, + triggerOnClosedMergeRequest: false, + triggerOnApprovedMergeRequest: false, + labelsThatForcesBuildIfAdded: "", + branchFilterName: "", + sourceBranchRegex: "", + targetBranchRegex: '^(.*/)?main$', + mergeRequestLabelFilterConfig: [ + include: "", + exclude: "" + ], + pendingBuildName: "jenkins", + cancelPendingBuildsOnUpdate: true ] ]) ]) @@ -435,23 +451,39 @@ If you want to configure any of the optional job triggers that the plugin suppor ```groovy triggers { gitlab( - triggerOnPush: false, - triggerOnMergeRequest: true, triggerOpenMergeRequestOnPush: "never", - triggerOnNoteRequest: true, - noteRegex: "Jenkins please retry a build", - skipWorkInProgressMergeRequest: true, - ciSkip: false, - setBuildDescription: true, - addNoteOnMergeRequest: true, - addCiMessage: true, - addVoteOnMergeRequest: true, - acceptMergeRequestOnSuccess: false, - branchFilterType: "NameBasedFilter", - includeBranchesSpec: "release/qat", - excludeBranchesSpec: "", - pendingBuildName: "Jenkins", - cancelPendingBuildsOnUpdate: false, - secretToken: "abcdefghijklmnopqrstuvwxyz0123456789ABCDEF") + triggerOnPush: false, + triggerOnMergeRequest: true, + triggerOpenMergeRequestOnPush: "never", + triggerOnNoteRequest: true, + noteRegex: "Jenkins please retry a build", + skipWorkInProgressMergeRequest: true, + ciSkip: false, + setBuildDescription: true, + addNoteOnMergeRequest: true, + addCiMessage: true, + addVoteOnMergeRequest: true, + acceptMergeRequestOnSuccess: false, + branchFilterType: "NameBasedFilter", + includeBranchesSpec: "release/qat", + excludeBranchesSpec: "", + pendingBuildName: "Jenkins", + cancelPendingBuildsOnUpdate: false, + secretToken: "abcdefghijklmnopqrstuvwxyz0123456789ABCDEF", + triggerToBranchDeleteRequest: false, + triggerOnlyIfNewCommitsPushed: false, + triggerOnPipelineEvent: false, + triggerOnAcceptedMergeRequest: true, + triggerOnClosedMergeRequest: false, + triggerOnApprovedMergeRequest: false, + labelsThatForcesBuildIfAdded: "", + branchFilterName: "", + sourceBranchRegex: "", + targetBranchRegex: '^(.*/)?main$', + mergeRequestLabelFilterConfig: [ + include: "", + exclude: "" + ] + ) } ``` From e1b513a2bcf131aeb65d5d991ff3b77258b6c963 Mon Sep 17 00:00:00 2001 From: AniketNS Date: Sat, 30 Dec 2023 16:26:09 +0530 Subject: [PATCH 3/4] Corrected pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 16d63a337..34a9f632c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ gitlab-plugin - 1.7.18 + ${revision}${changelist} hpi GitLab Plugin https://github.com/jenkinsci/${project.artifactId} @@ -32,7 +32,7 @@ scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git - gitlab-plugin-1.7.18 + ${scmTag} https://github.com/${gitHubRepo} @@ -50,7 +50,7 @@ - 1.7.17 + 1.7.19 -SNAPSHOT 2.387.3 Max From 5c4aad320654b1e9e36aa90c1235365021d09fec Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 30 Dec 2023 05:13:27 -0700 Subject: [PATCH 4/4] Reduce white space changes to simplify code review --- README.md | 62 ++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index f2b8a0181..e58e942e7 100644 --- a/README.md +++ b/README.md @@ -451,39 +451,35 @@ If you want to configure any of the optional job triggers that the plugin suppor ```groovy triggers { gitlab( - triggerOnPush: false, - triggerOnMergeRequest: true, - triggerOpenMergeRequestOnPush: "never", - triggerOnNoteRequest: true, - noteRegex: "Jenkins please retry a build", - skipWorkInProgressMergeRequest: true, - ciSkip: false, - setBuildDescription: true, - addNoteOnMergeRequest: true, - addCiMessage: true, - addVoteOnMergeRequest: true, - acceptMergeRequestOnSuccess: false, - branchFilterType: "NameBasedFilter", - includeBranchesSpec: "release/qat", - excludeBranchesSpec: "", - pendingBuildName: "Jenkins", - cancelPendingBuildsOnUpdate: false, - secretToken: "abcdefghijklmnopqrstuvwxyz0123456789ABCDEF", - triggerToBranchDeleteRequest: false, - triggerOnlyIfNewCommitsPushed: false, - triggerOnPipelineEvent: false, - triggerOnAcceptedMergeRequest: true, - triggerOnClosedMergeRequest: false, - triggerOnApprovedMergeRequest: false, - labelsThatForcesBuildIfAdded: "", - branchFilterName: "", - sourceBranchRegex: "", - targetBranchRegex: '^(.*/)?main$', - mergeRequestLabelFilterConfig: [ - include: "", - exclude: "" - ] - ) + triggerOnPush: false, + triggerOnMergeRequest: true, triggerOpenMergeRequestOnPush: "never", + triggerOnNoteRequest: true, + noteRegex: "Jenkins please retry a build", + skipWorkInProgressMergeRequest: true, + ciSkip: false, + setBuildDescription: true, + addNoteOnMergeRequest: true, + addCiMessage: true, + addVoteOnMergeRequest: true, + acceptMergeRequestOnSuccess: false, + branchFilterType: "NameBasedFilter", + includeBranchesSpec: "release/qat", + excludeBranchesSpec: "", + pendingBuildName: "Jenkins", + cancelPendingBuildsOnUpdate: false, + secretToken: "abcdefghijklmnopqrstuvwxyz0123456789ABCDEF", + triggerToBranchDeleteRequest: false, + triggerOnlyIfNewCommitsPushed: false, + triggerOnPipelineEvent: false, + triggerOnAcceptedMergeRequest: true, + triggerOnClosedMergeRequest: false, + triggerOnApprovedMergeRequest: false, + labelsThatForcesBuildIfAdded: "", + branchFilterName: "", + sourceBranchRegex: "", + targetBranchRegex: '^(.*/)?main$', + mergeRequestLabelFilterConfig: [include: "", exclude: ""] + ) } ```