Changeset 13c98a4 for Jenkinsfile

Timestamp:

Apr 24, 2019, 3:14:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3c40dc2a

Parents:

f85464da

Message:

Jenkins emails now use html, this push does some work to improve how they look

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -66 +66 @@
         finally {
                 //Send email with final results if this is not a full build
-                if( Settings && !Settings.Silent ) {
-                        email(log_needed, Settings.IsSandbox)
-                }
+                email(log_needed)
 
                 echo 'Build Completed'
@@ -200 +198 @@
 
         return """
+<pre>
 The branch ${env.BRANCH_NAME} has been updated.
 ${gitUpdate}
-
-Check console output at ${env.BUILD_URL} to view the results.
-
-- Status --------------------------------------------------------------
-
-BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}
-
-- Log -----------------------------------------------------------------
+</pre>
+
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
+
+<p>- Status --------------------------------------------------------------</p>
+
+<p>BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}</p>
+
+<p>- Log -----------------------------------------------------------------</p>
+
+<pre>
 ${gitLog}
------------------------------------------------------------------------
+</pre>
+
+<p>-----------------------------------------------------------------------</p>
+<pre>
 Summary of changes:
 ${gitDiff}
+</pre>
 """
 }
 
 //Standard build email notification
-def email(boolean log, boolean bIsSandbox) {
+def email(boolean log) {
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
         //Configurations for email format
@@ -225 +231 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}] - branch ${env.BRANCH_NAME}"
-        def email_body = """This is an automated email from the Jenkins build machine. It was
+        def email_body = """<p>This is an automated email from the Jenkins build machine. It was
 generated because of a git hooks/post-receive script following
-a ref change which was pushed to the Cforall repository.
+a ref change which was pushed to the C∀ repository.</p>
 """ + GitLogMessage()
 
-        def email_to = "cforall@lists.uwaterloo.ca"
-
-        if( Settings && !Settings.IsSandbox ) {
+        def email_to = !Settings.IsSandbox ? "cforall@lists.uwaterloo.ca" : "tdelisle@uwaterloo.ca"
+
+        if( Settings && !Settings.Silent ) {
                 //send email notification
                 emailext body: email_body, subject: email_subject, to: email_to, attachLog: log