Changeset 933f32f for Jenkins/FullBuild

Timestamp:

May 24, 2019, 10:19:41 AM (7 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:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

• Jenkins/FullBuild (modified) (7 diffs)

Jenkins/FullBuild

@@ -17 +17 @@
 
                                 parallel (
-                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64', true  ) },
-                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86', true  ) },
-                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64', false ) },
-                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86', false ) },
-                                        clang_x64: { trigger_build( 'clang',   'x64', false ) },
-                                        clang_x86: { trigger_build( 'clang',   'x86', false ) },
+                                        gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
+                                        gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
+                                        gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
+                                        gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
+                                        clang_x64: { trigger_build( 'clang',   'x64' ) },
+                                        clang_x86: { trigger_build( 'clang',   'x86' ) },
                                 )
                         }
+                }
 
-                        //Push latest changes to do-lang repo
-                        push_build()
-                }
+                promote_email(true)
         }
 
@@ -43 +42 @@
 
                 //Send email to notify the failure
-                promote_failure_email()
+                promote_email(false)
         }
 
@@ -57 +56 @@
 //===========================================================================================================
 
-def trigger_build(String cc, String arch, Boolean publish) {
+def trigger_build(String cc, String arch) {
         def result = build job: 'Cforall/master',               \
                 parameters: [                                           \
@@ -77 +76 @@
                         [$class: 'BooleanParameterValue',               \
                           name: 'Publish',                              \
-                          value: publish],                              \
+                          value: true],                                 \
                         [$class: 'BooleanParameterValue',               \
                           name: 'Silent',                               \
@@ -89 +88 @@
                 sh("wget -q -O - http://localhost:8084/jenkins/job/Cforall/job/master/${result.number}/consoleText")
                 error(result.result)
-        }
-}
-
-def push_build() {
-        //Don't use the build_stage function which outputs the compiler
-        stage('Push') {
-
-                status_prefix = 'Push'
-
-                def out_dir = pwd tmp: true
-                sh "mkdir -p ${out_dir}"
-
-                //checkout the code to make sure this is a valid git repo
-                checkout scm
-
-                collect_git_info()
-
-                //parse git logs to find what changed
-                sh "git remote > ${out_dir}/GIT_REMOTE"
-                git_remote = readFile("${out_dir}/GIT_REMOTE")
-                remoteDoLangExists = git_remote.contains("DoLang")
-
-                if( !remoteDoLangExists ) {
-                        sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
-                }
-
-                //sh "GIT_SSH_COMMAND=\"ssh -v\" git push DoLang ${gitRefNewValue}:master"
-                echo('BUILD NOT PUSH SINCE DO-LANG SERVER WAS DOWN')
         }
 }
@@ -141 +112 @@
 
 //Email notification on a full build failure
-def promote_failure_email() {
+def promote_email(boolean success) {
         echo('notifying users')
+
+        def result = success ? "PROMOTE - SUCCESS" : "PROMOTE - FAILURE"
 
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
         //Configurations for email format
-        def email_subject = "[cforall git][PROMOTE - FAILURE]"
-        def email_body = """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 was pushed to the repository containing
-the project "UNNAMED PROJECT".
+        def email_subject = "[cforall git][${result}]"
+        def email_body = """<p>This is an automated email from the Jenkins build machine. It was
+generated following the result of the C\u2200 nightly build.</p>
 
-Check console output at ${env.BUILD_URL} to view the results.
+<p>Check console output at ${env.BUILD_URL} to view the results.</p>
 
-- Status --------------------------------------------------------------
+<p>- Status --------------------------------------------------------------</p>
 
-PROMOTE FAILURE
+<p>${result}</p>
+
+<p>- Performance ---------------------------------------------------------</p>
+
+<img src="https://cforall.uwaterloo.ca/jenkins/job/Cforall/job/master/plot/Compilation/getPlot?index=0" >
+
+<p>- Logs ----------------------------------------------------------------</p>
 """
 
@@ -162 +139 @@
 
         //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
+        emailext body: email_body, subject: email_subject, to: email_to, attachLog: !success
 }