[10.0.x] isolate pr checks between branches (#1784)

apache · Jul 22, 2024 · 6513ba1 · 6513ba1
1 parent 385d454
commit 6513ba1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.ci/jenkins/Jenkinsfile → .ci/jenkins/Jenkinsfile.pr.10.0.x b/.ci/jenkins/Jenkinsfile → .ci/jenkins/Jenkinsfile.pr.10.0.x
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -103,8 +103,14 @@ pipeline {
             steps {
                 script {
                     dir(getRepoName()) {
+                        githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
+                        def mainBranchPrCheckJenkinsfile = '.ci/jenkins/Jenkinsfile'
+                        def newBranchPrCheckJenkinsfile = ".ci/jenkins/Jenkinsfile.pr.${getBuildBranch()}"
+                        if (!isMainBranch() && fileExists(mainBranchPrCheckJenkinsfile)) {
+                            sh "mv ${mainBranchPrCheckJenkinsfile} ${newBranchPrCheckJenkinsfile}"
+                            sh "git add ${newBranchPrCheckJenkinsfile}"
+                        }
                         if (githubscm.isThereAnyChanges()) {
-                            githubscm.setUserConfigFromCreds(getGitAuthorPushCredsId())
                             githubscm.commitChanges("[${getBuildBranch()}] Update version to ${getKogitoVersion()}")
                             githubscm.pushObject('origin', getBuildBranch(), getGitAuthorPushCredsId())
                         } else {

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -64,7 +64,8 @@ void setupPrJob() {
     setupBuildAndTestJob(JobType.PULL_REQUEST)
 
     // Branch Source Plugin multibranchPipelineJob
-    Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
+    def triggeringJenkinsfileName = Utils.isMainBranch(this) ? "Jenkinsfile" : "Jenkinsfile.pr.${Utils.getGitBranch(this)}"
+    KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/${triggeringJenkinsfileName}", JobType.PULL_REQUEST.getName())
 }
 
 void createSetupBranchJob() {