Changes in / [3dcd11ba:1c54958]

Location:

Jenkins

Files:

• FullBuild (modified) (1 diff)
• Promote (deleted)
• tools.groovy (modified) (3 diffs)

Jenkins/FullBuild

@@ -106 +106 @@
 
         if(result.result != 'SUCCESS') {
-                sh("wget -q -O - https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/${result.number}/consoleText")
+                sh("wget -q -O - http://localhost:8084/jenkins/job/Cforall/job/master/${result.number}/consoleText")
                 error(result.result)
         }

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 )
@@ -81 +86 @@
         gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
         gitDiff = gitDiff.replace('[m', '</span>')
+
+        PrevGitOldRef = oldRef
+        PrevGitNewRef = newRef
 
         return """
@@ -108 +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;