move endTime to finally block

Change-Id: I1d6c79c4cc0e0c188d0d5f1e6b5b486966f1bb43 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/283475 Reviewed-by: Brian Watson <[email protected]> QA-Review: James Butters <[email protected]> Product-Review: James Butters <[email protected]> Tested-by: Service Cloud Jenkins <[email protected]>
seandong · Jan 24, 2022 · 313f4c2 · 313f4c2
1 parent 0de47ab
commit 313f4c2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Jenkinsfile.rspecq b/Jenkinsfile.rspecq
@@ -95,8 +95,6 @@ def sendCrystalballMetrics(startTime, endTime) {
     def exampleCount = sh(script: "docker run -e TEST_QUEUE_HOST -t --rm $REGISTRY_BASE/redis:alpine /bin/sh -c '\
                                           redis-cli -h $TEST_QUEUE_HOST -p 6379 get ${JOB_NAME}_build${BUILD_NUMBER}_selenium:example_count'", returnStdout: true).replaceAll('"', '').trim()
 
-    def executionTime = (endTime - startTime)
-    print "========= endTime class: ${endTime.getClass()} \n============= executionTime: ${executionTime}"
     reportToSplunk('selenium_crystalball_data', [
                     'node_count': rspecqNodeTotal,
                     'example_count': exampleCount.toInteger(),
@@ -208,7 +206,6 @@ pipeline {
                       --queue-wait-timeout 120 \
                       --redis-url $RSPECQ_REDIS_URL \
                       --report", label: 'Reporter')
-                    endTime = System.currentTimeMillis()
                   } catch (org.jenkinsci.plugins.workflow.steps.FlowInterruptedException e) {
                     if (e.causes[0] instanceof org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution.ExceededTimeout) {
                       /* groovylint-disable-next-line GStringExpressionWithinString, SpaceInsideParentheses */
@@ -221,6 +218,8 @@ pipeline {
                       '''
                     }
                     throw e
+                  } finally {
+                     endTime = System.currentTimeMillis()
                   }
                 }