correct

apache · Jun 27, 2023 · 2bd561e · 2bd561e
1 parent 90888d8
commit 2bd561e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
                 script {
                     clean()
 
-                    githubscm.checkoutIfExists('kogito-images', getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
+                    githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getChangeTarget(), true)
                 }
             }
         }
@@ -78,7 +78,7 @@ Closure createBuildAndTestStageClosure(String image) {
             githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getGitAuthorCredentialsId())
             githubscm.updateGithubCommitStatus(image, state, 'PENDING', 'Queued')
 
-            def job = build(job: "kogito-images.build-image", wait: true, parameters: buildParams, propagate: false)
+            def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
             if (job.result != 'SUCCESS') {
                 if (job.result == 'UNSTABLE') {
                     unstable("Tests on ${image} seems to have failed")
@@ -113,3 +113,11 @@ String getChangeBranch() {
 String getChangeTarget() {
     return env.ghprbTargetBranch ?: CHANGE_TARGET
 }
+
+String getRepoName() {
+    return env.REPO_NAME
+}
+
+String getGitAuthorCredentialsId() {
+    return env.AUTHOR_CREDS_ID
+}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -63,6 +63,9 @@ void setupPrJob(boolean isProdCI = false) {
         jobParams.pr.commitContext = '(Prod) Check Images'
         jobParams.env.put('PROD_CI', true)
     }
+    jobParams.env.putAll([
+        AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+    ])
     KogitoJobTemplate.createPRJob(this, jobParams)
 }