kie-issues#776: automate PR merge into protected branches

apache · May 10, 2024 · c199049 · c199049
1 parent 59b5ddb
commit c199049
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.kie-kogito-post-release b/.ci/jenkins/Jenkinsfile.kie-kogito-post-release
@@ -38,7 +38,7 @@ pipeline {
                 script{
                     sh 'printenv'
                     dir(docsRepo){
-                        checkoutRepo(docsRepo, GIT_AUTHOR, getDocsRepoBranch(), GIT_AUTHOR_CREDENTIALS_ID)
+                        checkoutRepo(docsRepo, GIT_AUTHOR, getDocsRepoBranch(), getGitAuthorCredsId())
                     }
                 }
             }
@@ -83,6 +83,7 @@ pipeline {
                     dir("${docsRepo}/doc-content/kogito-docs") {
                         maven.mvnVersionsSet(parseVersion(getKogitoDocsVersion()))
                         if (githubscm.isThereAnyChanges()){
+                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                             githubscm.commitChanges(commitMsg)
                         }
                     }
@@ -116,7 +117,7 @@ pipeline {
             steps {
                 script {
                     dir("${docsRepo}/doc-content/kogito-docs") {
-                        githubscm.pushRemoteTag('origin', "${getKogitoDocsVersion()}-kogito")
+                        githubscm.pushRemoteTag('origin', "${getKogitoDocsVersion()}-kogito", getGitAuthorPushCredsId())
                     }
                 }
             }
@@ -152,9 +153,7 @@ pipeline {
                     script{
                         // Add changed files, commit, open and merge PR
                         String prLink = commitAndCreatePR(commitMsg, PR_BRANCH, getDocsRepoBranch())
-                        sh "git checkout ${getDocsRepoBranch()}"
-                        mergeAndPush(prLink, getDocsRepoBranch())
-                        githubscm.removeRemoteBranch('origin', PR_BRANCH, getGitAuthorCredsId())  
+                        approveAndMergePR(prLink)
                     }
                 }
             }
@@ -170,8 +169,8 @@ pipeline {
     }
 }
 
-void checkoutRepo(String repo, String GIT_AUTHOR, String branch, String GIT_AUTHOR_CREDENTIALS_ID) {
-    checkout(githubscm.resolveRepository(repo, GIT_AUTHOR, branch, false, GIT_AUTHOR_CREDENTIALS_ID))
+void checkoutRepo(String repo, String gitAuthor, String branch, String credsId) {
+    checkout(githubscm.resolveRepository(repo, gitAuthor, branch, false, credsId))
     // need to manually checkout branch since on a detached branch after checkout command
     sh "git checkout ${branch}"
 }
@@ -219,7 +218,11 @@ boolean isNewVersionRequired() {
 }
 
 String getGitAuthorCredsId() {
-    return env.GIT_AUTHOR_CREDENTIALS_ID
+    return env.GIT_AUTHOR_CREDS_ID
+}
+
+String getGitAuthorPushCredsId() {
+    return env.GIT_AUTHOR_PUSH_CREDS_ID
 }
 
 void sendErrorNotification() {
@@ -236,16 +239,17 @@ String parseCommunityVersion(String docVersion) {
     return "${versionSplit[0]}.${versionSplit[1]}"
 }
 
-void mergeAndPush(String prLink, String targetBranch) {
+void approveAndMergePR(String prLink) {
     if (prLink?.trim()) {
-        githubscm.mergePR(prLink, getGitAuthorCredsId())
-        githubscm.pushObject('origin', targetBranch, getGitAuthorCredsId())
+        githubscm.approvePR(prLink, getGitAuthorPushCredsId())
+        githubscm.mergePR(prLink, getGitAuthorPushCredsId())
     }
 }
 
 String commitAndCreatePR(String commitMsg, String localBranch, String targetBranch) {
     def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}"
+    githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
     githubscm.commitChanges(commitMsg)
-    githubscm.pushObject('origin', localBranch, getGitAuthorCredsId())
+    githubscm.pushObject('origin', localBranch, getGitAuthorPushCredsId())
     return githubscm.createPR(commitMsg, prBody, targetBranch, getGitAuthorCredsId())
-}
+}