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

File:

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

Jenkins/tools.groovy

@@ -61 +61 @@
 }
 
-def ConstructGitLogMessage(String oldRef, String newRef) {
+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 revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
         def revList = SplitLines( revText )
@@ -82 +87 @@
         gitDiff = gitDiff.replace('[m', '</span>')
 
+        PrevGitOldRef = oldRef
+        PrevGitNewRef = newRef
+
         return """
-<p>- Changes -------------------------------------------------------------</p>
-
 <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>
@@ -104 +116 @@
 }
 
-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;