Changes in Jenkinsfile [afab6dc:ab60d6d]

File:

• Jenkinsfile (modified) (8 diffs)

Jenkinsfile

@@ -35 +35 @@
 }
 
-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}"
-
-                //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 push DoLang ${gitRefNewValue}:master"
-}
-
 //===========================================================================================================
 // Helper classes/variables/routines to make the status and stage name easier to use
@@ -88 +67 @@
 def collect_git_info() {
 
-        //create the temporary output directory in case it doesn't already exist
         def out_dir = pwd tmp: true
-        sh "mkdir -p ${out_dir}"
-
-        //parse git logs to find what changed
         gitRefName = env.BRANCH_NAME
         dir("../${gitRefName}@script") {
@@ -107 +82 @@
 node ('master'){
 
-        boolean doPromoteBuild2DoLang
         def err = null
         def log_needed = false
@@ -122 +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'                           \
-                                                ]]                                                                      \
-                                        ]])
-
-                                doPromoteBuild2DoLang = promoteBuild2DoLang == 'true'
-
-                                echo "FULL BUILD = ${doPromoteBuild2DoLang}"
-
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
@@ -148 +108 @@
                                 cfa_build()
 
-                                if( doPromoteBuild2DoLang ) {
-                                        push_build()
-                                }
                         }
                 }
@@ -170 +127 @@
         finally {
                 //Send email with final results
-                notify_result(doPromoteBuild2DoLang, err, currentBuild.result, log_needed)
+                email(currentBuild.result, log_needed)
 
                 /* Must re-throw exception to propagate error */
@@ -182 +139 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
-def notify_result(boolean promote, Exception err, String status, boolean log) {
-        if(promote)     {
-                if( err ) {
-                        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
@@ -235 +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.