Changeset ec5d599 for Jenkins/tools.groovy

Timestamp:

Dec 5, 2020, 8:48:42 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e91a255

Parents:

7c1144b (diff), ad915e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

Jenkins/tools.groovy

@@ -37 +37 @@
                 //checkout the source code and clean the repo
                 if(commitHash) {
-                        final scmVars = checkout([$class: 'GitSCM', branches: [[name: 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']]
+                        ])
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
                 } else {
-
                         final scmVars = checkout scm
                         echo GitLogMessage(scmVars.GIT_COMMIT, scmVars.GIT_PREVIOUS_COMMIT)
@@ -61 +65 @@
 }
 
-def GitLogMessage(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 +90 @@
         gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
         gitDiff = gitDiff.replace('[m', '</span>')
+
+        PrevGitOldRef = oldRef
+        PrevGitNewRef = newRef
 
         return """