Changeset 7b1a604

Timestamp:

Jun 6, 2016, 12:22:50 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ab60d6d

Parents:

de62f0f0

Message:

• Removed properties from Jenkinsfile
• Email sent now writes correct summary of changes

File:

• Jenkinsfile (modified) (5 diffs)

Jenkinsfile

@@ -74 +74 @@
         status_prefix = ''
 
-        //Properties sent by the git-hooks (ref name, latest commit hash, previous commit hash)
-        // properties( [[$class: 'ParametersDefinitionProperty', parameterDefinitions: \
-        //              [[$class: 'StringParameterDefinition', name: 'GitRefName',     defaultValue: 'master', description: 'name of the ref that changed' ], \
-        //               [$class: 'StringParameterDefinition', name: 'GitRefNewValue', defaultValue: 'HEAD',   description: 'new commit of the reference' ],  \
-        //               [$class: 'StringParameterDefinition', name: 'GitRefOldValue', defaultValue: 'HEAD~1', description: 'old commit of the reference']]   \
-        //      ]] )
+        try {
 
-        try {
-                def out_dir = pwd tmp: true
-                gitRefName = env.BRANCH_NAME
-                dir("../${gitRefName}@script") {
-                        sh "git reflog > ${out_dir}/GIT_COMMIT"
-                }
-                git_reflog = readFile("${out_dir}/GIT_COMMIT")
-                gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
-                gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
-
-                echo "Properties-start"
-                echo "ref name      : ${gitRefName}"
-                echo "ref new value : ${gitRefNewValue}"
-                echo "ref old value : ${gitRefOldValue}"
-                echo "Properties-stop"
 
                 //Prevent the build from exceeding 30 minutes
@@ -102 +82 @@
                         //Wrap build to add timestamp to command line
                         wrap([$class: 'TimestamperBuildWrapper']) {
+
+                                collect_git_info()
 
                                 //Compile using gcc-4.9
@@ -145 +127 @@
 }
 
+def collect_git_info() {
+
+        def out_dir = pwd tmp: true
+        gitRefName = env.BRANCH_NAME
+        dir("../${gitRefName}@script") {
+                sh "git reflog > ${out_dir}/GIT_COMMIT"
+        }
+        git_reflog = readFile("${out_dir}/GIT_COMMIT")
+        gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
+        gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
+}
+
 //===========================================================================================================
 //Routine responsible of sending the email notification once the build is completed
@@ -153 +147 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
+        sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
+        def gitLog = readFile('GIT_LOG')
+
+        sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
+        def gitDiff = readFile('GIT_DIFF')
+
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
         def email_body = """This is an automated email from the Jenkins build machine. It was
@@ -160 +160 @@
 
 The branch ${env.BRANCH_NAME} has been updated.
+         via  ${gitRefOldValue} (commit)
+        from  ${gitRefNewValue} (commit)
 
-Check console output at ${env.BUILD_URL} to view the results."""
+Check console output at ${env.BUILD_URL} to view the results.
 
-        // def config = new File('/u/cforall/software/cfa/cfa-cc/config').text
-        // def email_to = (config =~ /mailinglist ?= ?(.+)/)[0][1]
+- Status --------------------------------------------------------------
+
+BUILD# ${env.BUILD_NUMBER} - ${status}
+
+- Log -----------------------------------------------------------------
+${gitLog}
+-----------------------------------------------------------------------
+Summary of changes:
+${gitDiff}
+"""
+
         def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"