Changeset 7a927ed0

Timestamp:

Aug 17, 2018, 4:41:54 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

42ee8f2

Parents:

36fb4ce8

Message:

Jenkins now use script for build logs to reduce output

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -145 +145 @@
                 dir (BuildDir) {
                         //Append bench results
-                        sh "make --no-print-directory -C benchmark jenkins githash=${newRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
+                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
                 }
         }
@@ -178 +178 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def gitUpdate(String oldRef, String newRef) {
-        def update = ""
-        sh "git rev-list ${oldRef}..${newRef} > GIT_LOG";
-        readFile('GIT_LOG').eachLine { rev ->
-                sh "git cat-file -t ${rev} > GIT_TYPE"
-                def type = readFile('GIT_TYPE')
-
-                update += "       via  ${rev} (${type})\n"
-        }
-        def rev = oldRef
-        sh "git cat-file -t ${rev} > GIT_TYPE"
-        def type = readFile('GIT_TYPE')
-
-        update += "      from  ${rev} (${type})\n"
-        return update
-}
-
-def gitLog(String oldRef, String newRef) {
-        sh "git rev-list --format=short ${oldRef}...${newRef} > ${BuildDir}/GIT_LOG"
-        return readFile("${BuildDir}/GIT_LOG")
-}
-
-def gitDiff(String oldRef, String newRef) {
-        sh "git diff --stat ${newRef} ${oldRef} > ${BuildDir}/GIT_DIFF"
-        return readFile("${BuildDir}/GIT_DIFF")
-}
-
 def GitLogMessage() {
         if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
 
+        dir(BuildDir) {
+                sh "${SrcDir}/tools/PrettyGitLogs.sh ${Settings.GitOldRef} ${Settings.GitNewRef}";
+        }
+        def gitUpdate = readFile("${BuildDir}/GIT_TYPE").trim()
+        def gitLog    = readFile("${BuildDir}/GIT_LOG").trim()
+        def gitDiff   = readFile("${BuildDir}/GIT_DIFF").trim()
+
         return """
 The branch ${env.BRANCH_NAME} has been updated.
-${gitUpdate(Settings.GitOldRef, Settings.GitNewRef)}
+${gitUpdate}
 
 Check console output at ${env.BUILD_URL} to view the results.
@@ -219 +199 @@
 
 - Log -----------------------------------------------------------------
-${gitLog(Settings.GitOldRef, Settings.GitNewRef)}
+${gitLog}
 -----------------------------------------------------------------------
 Summary of changes:
-${gitDiff(Settings.GitOldRef, Settings.GitNewRef)}
+${gitDiff}
 """
 }