From 9ca7408929c15ffb9c30a4f1940e0c31c107a639 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Thu, 22 Apr 2021 15:56:24 -0700
Subject: [PATCH] SPEC-6499 Timeout in pipes expire due to logs being in a
 sub-step

---
 scripts/build/Jenkins/Jenkinsfile | 76 +++++++++++++++----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile
index 4352cb1e6a..fe60d9236c 100644
--- a/scripts/build/Jenkins/Jenkinsfile
+++ b/scripts/build/Jenkins/Jenkinsfile
@@ -337,14 +337,16 @@ def PreBuildCommonSteps(Map pipelineConfig, String repositoryName, String projec
 }
 
 def Build(Map options, String platform, String type, String workspace) {
-    def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
-    dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
-        if (env.IS_UNIX) {
-            sh label: "Running ${platform} ${type}",
-               script: "${options.PYTHON_DIR}/python.sh -u ${command}"
-        } else {
-            bat label: "Running ${platform} ${type}",
-                script: "${options.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\')
+    timeout(time: env.TIMEOUT, unit: 'MINUTES', activity: true) {
+        def command = "${options.BUILD_ENTRY_POINT} --platform ${platform} --type ${type}"
+        dir("${workspace}/${ENGINE_REPOSITORY_NAME}") {
+            if (env.IS_UNIX) {
+                sh label: "Running ${platform} ${type}",
+                   script: "${options.PYTHON_DIR}/python.sh -u ${command}"
+            } else {
+                bat label: "Running ${platform} ${type}",
+                    script: "${options.PYTHON_DIR}/python.cmd -u ${command}".replace('/','\\')
+            }
         }
     }
 }
@@ -502,43 +504,41 @@ try {
                             envVars['IS_UNIX'] = 1
                         }
                         withEnv(GetEnvStringList(envVars)) {
-                            timeout(time: envVars['TIMEOUT'], unit: 'MINUTES', activity: true) {
-                                try {
-                                    def build_job_name = build_job.key
+                            try {
+                                def build_job_name = build_job.key
 
-                                    CreateSetupStage(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platform.key, build_job.key, envVars).call()
+                                CreateSetupStage(pipelineConfig, repositoryName, projectName, pipelineName, branchName, platform.key, build_job.key, envVars).call()
 
-                                    if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages
-                                        build_job.value.steps.each { build_step ->
-                                            build_job_name = build_step
-                                            CreateBuildStage(pipelineConfig,  platform.key, build_step, envVars).call()
-                                        }
-                                    } else {
-                                        CreateBuildStage(pipelineConfig,  platform.key, build_job.key, envVars).call()
+                                if(build_job.value.steps) { //this is a pipe with many steps so create all the build stages
+                                    build_job.value.steps.each { build_step ->
+                                        build_job_name = build_step
+                                        CreateBuildStage(pipelineConfig,  platform.key, build_step, envVars).call()
                                     }
+                                } else {
+                                    CreateBuildStage(pipelineConfig,  platform.key, build_job.key, envVars).call()
+                                }
 
-                                    if (env.MARS_REPO && platform.key == 'Windows' && build_job_name.startsWith('test')) {
-                                        def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY
-                                        def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION
-                                        CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call()
-                                    }
+                                if (env.MARS_REPO && platform.key == 'Windows' && build_job_name.startsWith('test')) {
+                                    def output_directory = platform.value.build_types[build_job_name].PARAMETERS.OUTPUT_DIRECTORY
+                                    def configuration = platform.value.build_types[build_job_name].PARAMETERS.CONFIGURATION
+                                    CreateTestMetricsStage(pipelineConfig, branchName, envVars, build_job_name, output_directory, configuration).call()
                                 }
-                                catch(Exception e) {
-                                    //  https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java
-                                    //  {SUCCESS,UNSTABLE,FAILURE,NOT_BUILT,ABORTED}
-                                    def currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE'
-                                    if (currentResult == 'FAILURE') {
-                                        currentBuild.result = 'FAILURE'
-                                        error "FAILURE: ${e}"
-                                    } else if (currentResult == 'UNSTABLE') {
-                                        currentBuild.result = 'UNSTABLE'
-                                        unstable(message: "UNSTABLE: ${e}")
-                                    }
-                                }
-                                finally {
-                                    CreateTeardownStage(envVars).call()
+                            }
+                            catch(Exception e) {
+                                //  https://github.com/jenkinsci/jenkins/blob/master/core/src/main/java/hudson/model/Result.java
+                                //  {SUCCESS,UNSTABLE,FAILURE,NOT_BUILT,ABORTED}
+                                def currentResult = envVars['ON_FAILURE_MARK'] ?: 'FAILURE'
+                                if (currentResult == 'FAILURE') {
+                                    currentBuild.result = 'FAILURE'
+                                    error "FAILURE: ${e}"
+                                } else if (currentResult == 'UNSTABLE') {
+                                    currentBuild.result = 'UNSTABLE'
+                                    unstable(message: "UNSTABLE: ${e}")
                                 }
                             }
+                            finally {
+                                CreateTeardownStage(envVars).call()
+                            }
                         }
                     }
                 }