Changes in / [905cf4b:89ce869]

File:

• Jenkinsfile (modified) (6 diffs)

Jenkinsfile

@@ -33 +33 @@
                 //do a maintainer-clean to make sure we need to remake from scratch
                 sh 'make maintainer-clean > /dev/null'
-}
-
-def push_build() {
-        build_stage 'Push'
-
-                sh 'git remote add DoLang git@gitlab.do-lang.org:internal/cfa-cc.git'
-                sh 'git push DoLang master'
 }
 
@@ -103 +96 @@
                                 collect_git_info()
 
-                                properties ([                                                                   \
-                                        [$class: 'ParametersDefinitionProperty',                                \
-                                                parameterDefinitions: [                                         \
-                                                [$class: 'BooleanParameterDefinition',                          \
-                                                  defaultValue: false,                                          \
-                                                  description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
-                                                  name: 'promoteBuild2DoLang'                           \
-                                                ]]                                                                      \
-                                        ]])
-
-                                echo "FULL BUILD = ${promoteBuild2DoLang}"
-
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
@@ -127 +108 @@
                                 cfa_build()
 
-                                if(promote_build) {
-                                        push_build()
-                                }
                         }
                 }
@@ -149 +127 @@
         finally {
                 //Send email with final results
-                notify_result(promote_build, err != null, currentBuild.result, log_needed)
+                email(currentBuild.result, log_needed)
 
                 /* Must re-throw exception to propagate error */
@@ -161 +139 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def promote_email(boolean promote, boolean success, String status, boolean log) {
-        if(promote)     {
-                if( !success ) {
-                        promote_email(status)
-                }
-        }
-        else {
-                email(status, log)
-        }
-}
-
-//Email notification on a full build failure
-def promote_email(String status) {
-        //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".
-
-Check console output at ${env.BUILD_URL} to view the results.
-
-- Status --------------------------------------------------------------
-
-PROMOTE FAILURE - ${status}
-"""
-
-        def email_to = "pabuhr@uwaterloo.ca, rschlunt@uwaterloo.ca, a3moss@uwaterloo.ca, tdelisle@uwaterloo.ca, brice.dobry@huawei.com"
-
-        //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: true
-}
-
-//Standard build email notification
 def email(String status, boolean log) {
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
@@ -214 +157 @@
 
 The branch ${env.BRANCH_NAME} has been updated.
-   via  ${gitRefOldValue} (commit)
-  from  ${gitRefNewValue} (commit)
+         via  ${gitRefOldValue} (commit)
+        from  ${gitRefNewValue} (commit)
 
 Check console output at ${env.BUILD_URL} to view the results.