[sling-tooling-jenkins] 01/01: SLING-12050 - Make build timeout configurable

[dklco]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch SLING-12050
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git

commit d9408a74c9fd882c59430919a0d39ae04cb89b76
Author: Dan Klco <k...@adobe.com>
AuthorDate: Wed Sep 27 23:00:43 2023 -0400

    SLING-12050 - Make build timeout configurable
---
 vars/slingOsgiBundleBuild.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 16bc9c5..3083dc0 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -164,6 +164,7 @@ def additionalMavenParams(def jobConfig) {
 
 def defineStage(def globalConfig, def jobConfig, def jdkVersion, def 
operatingSystem, boolean isReferenceStage, boolean shouldDeploy) {
 
+    def buildTimeout = jobConfig.buildTimeout ? jobConfig.buildTimeout : 30
     def goal = jobConfig.mavenGoal ? jobConfig.mavenGoal : ( isReferenceStage 
? "deploy" : "verify" )
     def additionalMavenParams = additionalMavenParams(jobConfig)
     def jenkinsJdkLabel = jenkinsJdkLabel(jdkVersion, globalConfig)
@@ -219,7 +220,7 @@ def defineStage(def globalConfig, def jobConfig, def 
jdkVersion, def operatingSy
     return {
         node(jenkinsNodeLabel) {
             dir(jenkinsJdkLabel) { // isolate parallel builds on same node
-                timeout(time: 30, unit: 'MINUTES') {
+                timeout(time: buildTimeout, unit: 'MINUTES') {
                     checkout scm
                     stage("Maven Build (Java ${jdkVersion}, ${goal})") {
                         echo "Running on node ${env.NODE_NAME}"
@@ -230,7 +231,7 @@ def defineStage(def globalConfig, def jobConfig, def 
jdkVersion, def operatingSy
                     // SonarQube must be executed on the same node in order to 
reuse artifact from the Maven build
                     if ( jobConfig.sonarQubeEnabled ) {
                         stage('Analyse with SonarCloud') {
-                            timeout(time: 30, unit: 'MINUTES') {
+                            timeout(time: buildTimeout, unit: 'MINUTES') {
                                 analyseWithSonarCloud(globalConfig, jobConfig)
                             }
                         }