Changes in Jenkins/tools.groovy [9c4ad67:6c9e0bc]

File:

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

Jenkins/tools.groovy

@@ -37 +37 @@
                 //checkout the source code and clean the repo
                 if(commitHash) {
-                        echo "Checking out commit <${commitHash}>"
-                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]],
-                                userRemoteConfigs: [[
-                                        url: 'cforall@plg.uwaterloo.ca:software/cfa/cfa-cc',
-                                        credentialsId: 'git_key_aug20']]
-                        ])
+                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: commitHash ]]])
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
                 } else {
+
                         final scmVars = checkout scm
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
@@ -65 +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 GitLogMessage(String oldRef, String newRef) {
         def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
         def revList = SplitLines( revText )
@@ -90 +81 @@
         gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
         gitDiff = gitDiff.replace('[m', '</span>')
-
-        PrevGitOldRef = oldRef
-        PrevGitNewRef = newRef
 
         return """