Changes in Jenkins/tools.groovy [9dd31e7:9824500]

File:

• Jenkins/tools.groovy (modified) (3 diffs)

Jenkins/tools.groovy

@@ -61 +61 @@
 }
 
-PrevGitOldRef = ''
-PrevGitNewRef = ''
-def GitLogMessage(String oldRef = '', String newRef = '') {
-        if (!oldRef) { if(!PrevGitOldRef) { return "\nERROR retrieveing current git information!\n"  } else { oldRef = PrevGitOldRef } }
-        if (!newRef) { if(!PrevGitNewRef) { return "\nERROR retrieveing previous git information!\n" } else { newRef = PrevGitNewRef } }
-
+def ConstructGitLogMessage(String oldRef, String newRef) {
         def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
         def revList = SplitLines( revText )
@@ -87 +82 @@
         gitDiff = gitDiff.replace('[m', '</span>')
 
-        PrevGitOldRef = oldRef
-        PrevGitNewRef = newRef
+        return """
+<p>- Changes -------------------------------------------------------------</p>
 
-        return """
 <pre>
 The branch ${env.BRANCH_NAME} has been updated.
 ${gitUpdate}
 </pre>
-
-<p>Check console output at ${env.BUILD_URL} to view the results.</p>
-
-<p>- Status --------------------------------------------------------------</p>
-
-<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
 
 <p>- Log -----------------------------------------------------------------</p>
@@ -116 +104 @@
 }
 
+EmailMessage = ''
+def GitLogMessage(String oldRef = '', String newRef = '') {
+        if(!EmailMessage) {
+                if (!oldRef) { return "\nERROR retrieveing current git information!\n"  }
+                if (!newRef) { return "\nERROR retrieveing previous git information!\n" }
+
+                echo "Constructing new git message"
+
+                EmailMessage = ConstructGitLogMessage(oldRef, newRef)
+        }
+        else {
+                echo "Reusing previously constructed message"
+        }
+        return EmailMessage;
+}
+
 return this;