From 482cac2349a93e8182faed1048cbfeec5bd49f56 Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Tue, 12 Sep 2023 13:52:41 +0200 Subject: [PATCH 1/2] PR multibranchPipelineJob --- .ci/jenkins/dsl/jobs.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy index 3fd7968a24..41f0147b80 100644 --- a/.ci/jenkins/dsl/jobs.groovy +++ b/.ci/jenkins/dsl/jobs.groovy @@ -192,9 +192,7 @@ Map getMultijobPRConfig(JenkinsFolder jobFolder) { } // Optaplanner PR checks -// Deactivated due to ghprb not available on Apache Jenkins -// TODO create PR job with branch source plugin -// KogitoJobUtils.createAllEnvironmentsPerRepoPRJobs(this) { jobFolder -> getMultijobPRConfig(jobFolder) } +Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile") // Setup branch branch createSetupBranchJob() From 5af0dc00784f11659c7c37bfcdcbb82780b956c7 Mon Sep 17 00:00:00 2001 From: jstastny-cz Date: Wed, 13 Sep 2023 16:27:15 +0200 Subject: [PATCH 2/2] set Jenkinsfile timeout time as int --- .ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile index bd14a10ad7..360483fe9d 100644 --- a/.ci/jenkins/Jenkinsfile +++ b/.ci/jenkins/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } options { timestamps() - timeout(time: '720', unit: 'MINUTES') + timeout(time: 720, unit: 'MINUTES') } environment { BUILDCHAIN_PROJECT = 'kiegroup/optaplanner'