Changeset b067d9b for Jenkinsfile

Timestamp:

Oct 29, 2019, 4:01:24 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• Jenkinsfile (modified) (10 diffs)

Jenkinsfile

@@ -1 +1 @@
 #!groovy
 
+import groovy.transform.Field
+
+// For skipping stages
+import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
+
 //===========================================================================================================
 // Main loop of the compilation
 //===========================================================================================================
-node ('master'){
-
-        boolean bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
+
+node('master') {
+        // Globals
+        BuildDir  = pwd tmp: true
+        SrcDir    = pwd tmp: false
+        Settings  = null
+        StageName = ''
+
+        // Local variables
         def err = null
         def log_needed = false
-
-        stage_name              = ''
-
-        compiler                = null
-        arch_name               = ''
-        architecture    = ''
-
-        do_alltests             = false
-        do_benchmark    = false
-        do_doc          = false
-        do_publish              = false
-        do_sendemail    = true
 
         currentBuild.result = "SUCCESS"
@@ -28 +27 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        notify_server(0)
-
-                        prepare_build()
-
-                        checkout()
-
-                        notify_server(0)
-
-                        build()
-
-                        test()
-
-                        benchmark()
-
-                        clean()
-
-                        build_doc()
-
-                        publish()
-
-                        notify_server(45)
+                        Settings = prepare_build()
+
+                        node(Settings.Architecture.node) {
+                                BuildDir  = pwd tmp: true
+                                SrcDir    = pwd tmp: false
+
+                                clean()
+
+                                checkout()
+
+                                build()
+
+                                test()
+
+                                benchmark()
+
+                                build_doc()
+
+                                publish()
+                        }
+
+                        // Update the build directories when exiting the node
+                        BuildDir  = pwd tmp: true
+                        SrcDir    = pwd tmp: false
                 }
         }
@@ -58 +60 @@
                 err = caughtError
 
+                echo err.toString()
+
                 //An error has occured, the build log is relevent
                 log_needed = true
 
                 //Store the result of the build log
-                currentBuild.result = "${stage_name} FAILURE".trim()
+                currentBuild.result = "${StageName} FAILURE".trim()
         }
 
         finally {
                 //Send email with final results if this is not a full build
-                if( do_sendemail && !bIsSandbox ) {
-                        echo 'Notifying users of result'
-                        email(currentBuild.result, log_needed)
-                }
+                email(log_needed)
 
                 echo 'Build Completed'
@@ -80 +81 @@
         }
 }
+//===========================================================================================================
+// Main compilation routines
+//===========================================================================================================
+def clean() {
+        build_stage('Cleanup', true) {
+                // clean the build by wipping the build directory
+                dir(BuildDir) {
+                        deleteDir()
+                }
+        }
+}
+
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+def checkout() {
+        build_stage('Checkout', true) {
+                //checkout the source code and clean the repo
+                final scmVars = checkout scm
+                Settings.GitNewRef = scmVars.GIT_COMMIT
+                Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
+
+                echo GitLogMessage()
+        }
+}
+
+def build() {
+        debug = true
+        release = Settings.RunAllTests || Settings.RunBenchmark
+        build_stage('Build : configure', true) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        //Configure the conpilation (Output is not relevant)
+                        //Use the current directory as the installation target so nothing escapes the sandbox
+                        //Also specify the compiler by hand
+                        targets=""
+                        if( Settings.RunAllTests || Settings.RunBenchmark ) {
+                                targets="--with-target-hosts='host:debug,host:nodebug'"
+                        } else {
+                                targets="--with-target-hosts='host:debug'"
+                        }
+
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
+
+                        // Configure libcfa
+                        sh 'make -j 8 --no-print-directory configure-libcfa'
+                }
+        }
+
+        build_stage('Build : cfa-cpp', true) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        // Build driver
+                        sh 'make -j 8 --no-print-directory -C driver'
+
+                        // Build translator
+                        sh 'make -j 8 --no-print-directory -C src'
+                }
+        }
+
+        build_stage('Build : libcfa(debug)', debug) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-debug"
+                }
+        }
+
+        build_stage('Build : libcfa(nodebug)', release) {
+                // Build outside of the src tree to ease cleaning
+                dir (BuildDir) {
+                        sh "make -j 8 --no-print-directory -C libcfa/${Settings.Architecture.name}-nodebug"
+                }
+        }
+}
+
+def test() {
+        try {
+                build_stage('Test: short', !Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                //Run the tests from the tests directory
+                                sh "make --no-print-directory -C tests archiveerrors=${BuildDir}/tests/crashes/short"
+                        }
+                }
+
+                build_stage('Test: full', Settings.RunAllTests) {
+                        dir (BuildDir) {
+                                        //Run the tests from the tests directory
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=yes archiveerrors=${BuildDir}/tests/crashes/full-debug"""
+                                        sh """make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no  archiveerrors=${BuildDir}/tests/crashes/full-nodebug"""
+                        }
+                }
+        }
+        catch (Exception err) {
+                echo "Archiving core dumps"
+                dir (BuildDir) {
+                        archiveArtifacts artifacts: "tests/crashes/**/*", fingerprint: true
+                }
+                throw err
+        }
+}
+
+def benchmark() {
+        build_stage('Benchmark', Settings.RunBenchmark) {
+                dir (BuildDir) {
+                        //Append bench results
+                        sh "make --no-print-directory -C benchmark jenkins arch=${Settings.Architecture.name}"
+                }
+        }
+}
+
+def build_doc() {
+        build_stage('Documentation', Settings.BuildDocumentation) {
+                dir ('doc/user') {
+                        make_doc()
+                }
+
+                dir ('doc/refrat') {
+                        make_doc()
+                }
+        }
+}
+
+def publish() {
+        build_stage('Publish', true) {
+
+                if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
+
+                def groupCompile = new PlotGroup('Compilation', 'duration (s) - lower is better', true)
+                def groupConcurrency = new PlotGroup('Concurrency', 'duration (n) - lower is better', false)
+
+                //Then publish the results
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , false, 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , true , 'Compilation (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, false, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, true , 'Context Switching (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, false, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, true , 'Mutual Exclusion (relative)')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, false, 'Internal and External Scheduling')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, true , 'Internal and External Scheduling (relative)')
+        }
+}
+
+//===========================================================================================================
+//Routine responsible of sending the email notification once the build is completed
+//===========================================================================================================
+@NonCPS
+def SplitLines(String text) {
+        def list = []
+
+        text.eachLine {
+                list += it
+        }
+
+        return list
+}
+
+def GitLogMessage() {
+        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
+
+        def oldRef = Settings.GitOldRef
+        def newRef = Settings.GitNewRef
+
+        def revText = sh(returnStdout: true, script: "git rev-list ${oldRef}..${newRef}").trim()
+        def revList = SplitLines( revText )
+
+        def gitUpdate = ""
+        revList.each { rev ->
+                def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+                gitUpdate = gitUpdate + "       via  ${rev} (${type})"
+        }
+
+        def rev = oldRef
+        def type = sh(returnStdout: true, script: "git cat-file -t ${rev}").trim()
+        gitUpdate = gitUpdate + "      from  ${rev} (${type})"
+
+        def gitLog    = sh(returnStdout: true, script: "git rev-list --format=short ${oldRef}...${newRef}").trim()
+
+        def gitDiff   = sh(returnStdout: true, script: "git diff --stat --color ${newRef} ${oldRef}").trim()
+        gitDiff = gitDiff.replace('[32m', '<span style="color: #00AA00;">')
+        gitDiff = gitDiff.replace('[31m', '<span style="color: #AA0000;">')
+        gitDiff = gitDiff.replace('[m', '</span>')
+
+        return """
+<pre>
+The branch ${env.BRANCH_NAME} has been updated.
+${gitUpdate}
+</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) {
+        //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
+        //Configurations for email format
+        echo 'Notifying users of result'
+
+        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 = """<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 C\u2200 repository.</p>
+""" + GitLogMessage()
+
+        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
+        } else {
+                echo "Would send email to: ${email_to}"
+                echo "With title: ${email_subject}"
+                echo "Content: \n${email_body}"
+        }
+}
 
 //===========================================================================================================
 // Helper classes/variables/routines
 //===========================================================================================================
-//Helper routine to collect information about the git history
-def collect_git_info() {
-
-        checkout scm
-
-        //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
-        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]
+//Description of a compiler (Must be serializable since pipelines are persistent)
+class CC_Desc implements Serializable {
+        public String name
+        public String CXX
+        public String CC
+
+        CC_Desc(String name, String CXX, String CC) {
+                this.name = name
+                this.CXX = CXX
+                this.CC = CC
+        }
+}
+
+//Description of an architecture (Must be serializable since pipelines are persistent)
+class Arch_Desc implements Serializable {
+        public String name
+        public String flags
+        public String node
+
+        Arch_Desc(String name, String flags, String node) {
+                this.name  = name
+                this.flags = flags
+                this.node  = node
+        }
+}
+
+class BuildSettings implements Serializable {
+        public final CC_Desc Compiler
+        public final Arch_Desc Architecture
+        public final Boolean RunAllTests
+        public final Boolean RunBenchmark
+        public final Boolean BuildDocumentation
+        public final Boolean Publish
+        public final Boolean Silent
+        public final Boolean IsSandbox
+        public final String DescLong
+        public final String DescShort
+
+        public String GitNewRef
+        public String GitOldRef
+
+        BuildSettings(java.util.Collections$UnmodifiableMap param, String branch) {
+                switch( param.Compiler ) {
+                        case 'gcc-6':
+                                this.Compiler = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                        break
+                        case 'gcc-5':
+                                this.Compiler = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                        break
+                        case 'gcc-4.9':
+                                this.Compiler = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+                        break
+                        case 'clang':
+                                this.Compiler = new CC_Desc('clang', 'clang++', 'gcc-6')
+                        break
+                        default :
+                                error "Unhandled compiler : ${cc}"
+                }
+
+                switch( param.Architecture ) {
+                        case 'x64':
+                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
+                        break
+                        case 'x86':
+                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
+                        break
+                        default :
+                                error "Unhandled architecture : ${arch}"
+                }
+
+                this.IsSandbox          = (branch == "jenkins-sandbox")
+                this.RunAllTests        = param.RunAllTests
+                this.RunBenchmark       = param.RunBenchmark
+                this.BuildDocumentation = param.BuildDocumentation
+                this.Publish            = param.Publish
+                this.Silent             = param.Silent
+
+                def full = param.RunAllTests ? " (Full)" : ""
+                this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
+
+                this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
+Architecture            : ${ this.Architecture.name }
+Arc Flags               : ${ this.Architecture.flags }
+Run All Tests           : ${ this.RunAllTests.toString() }
+Run Benchmark           : ${ this.RunBenchmark.toString() }
+Build Documentation     : ${ this.BuildDocumentation.toString() }
+Publish                 : ${ this.Publish.toString() }
+Silent                  : ${ this.Silent.toString() }
+"""
+
+                this.GitNewRef = ''
+                this.GitOldRef = ''
+        }
+}
+
+class PlotGroup implements Serializable {
+        public String name
+        public String unit
+        public boolean log
+
+        PlotGroup(String name, String unit, boolean log) {
+                this.name = name
+                this.unit = unit
+                this.log = log
+        }
 }
 
 def prepare_build() {
+        // prepare the properties
         properties ([                                                                                                   \
                 [$class: 'ParametersDefinitionProperty',                                                                \
@@ -107 +429 @@
                                 [$class: 'ChoiceParameterDefinition',                                           \
                                         description: 'Which compiler to use',                                   \
-                                        name: 'pCompiler',                                                              \
+                                        name: 'Compiler',                                                                       \
                                         choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
                                         defaultValue: 'gcc-6',                                                          \
@@ -113 +435 @@
                                 [$class: 'ChoiceParameterDefinition',                                           \
                                         description: 'The target architecture',                                 \
-                                        name: 'pArchitecture',                                                          \
+                                        name: 'Architecture',                                                           \
                                         choices: 'x64\nx86',                                                            \
                                         defaultValue: 'x64',                                                            \
@@ -119 +441 @@
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If false, only the quick test suite is ran',              \
-                                        name: 'pRunAllTests',                                                           \
+                                        name: 'RunAllTests',                                                            \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also runs benchmarks',           \
-                                        name: 'pRunBenchmark',                                                          \
-                                        defaultValue: true,                                                             \
+                                        name: 'RunBenchmark',                                                           \
+                                        defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also builds documentation',              \
-                                        name: 'pBuildDocumentation',                                                    \
+                                        name: 'BuildDocumentation',                                                     \
                                         defaultValue: true,                                                             \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins also publishes results',                 \
-                                        name: 'pPublish',                                                               \
+                                        name: 'Publish',                                                                        \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
                                         description: 'If true, jenkins will not send emails',           \
-                                        name: 'pSilent',                                                                        \
+                                        name: 'Silent',                                                                         \
                                         defaultValue: false,                                                            \
                                 ],                                                                                              \
@@ -145 +467 @@
                 ]])
 
-        compiler                = compiler_from_params( pCompiler )
-        arch_name               = pArchitecture
-        architecture    = architecture_from_params( arch_name )
-
-        do_alltests             = (pRunAllTests == 'true')
-        do_benchmark    = (pRunBenchmark == 'true')
-        do_doc          = (pBuildDocumentation == 'true')
-        do_publish              = (pPublish == 'true')
-        do_sendemail    = ! (pSilent == 'true')
-
-        echo """Compiler              : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
-Architecture            : ${arch_name}
-Arc Flags               : ${architecture}
-Run All Tests           : ${ pRunAllTests.toString() }
-Run Benchmark           : ${ pRunBenchmark.toString() }
-Build Documentation     : ${ pBuildDocumentation.toString() }
-Publish                 : ${ pPublish.toString() }
-Silent                  : ${ pSilent.toString() }
-"""
-
-        collect_git_info()
-}
-
-def build_stage(String name, Closure block ) {
-        stage_name = name
-        stage(name, block)
-}
-
-def notify_server(int wait) {
-        sh """curl --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
-        return
+        // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
+        checkout scm
+
+        final settings = new BuildSettings(params, env.BRANCH_NAME)
+
+        currentBuild.description = settings.DescShort
+        echo                       settings.DescLong
+
+        return settings
+}
+
+def build_stage(String name, boolean run, Closure block ) {
+        StageName = name
+        echo " -------- ${StageName} -------- "
+        if(run) {
+                stage(name, block)
+        } else {
+                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
+        }
 }
 
@@ -186 +496 @@
         catch (Exception caughtError) {
                 err = caughtError //rethrow error later
-                sh 'cat *.log'
+                sh 'cat build/*.log'
         }
         finally {
@@ -193 +503 @@
 }
 
-//Description of a compiler (Must be serializable since pipelines are persistent)
-class CC_Desc implements Serializable {
-        public String cc_name
-        public String cpp_cc
-        public String cfa_cc
-
-        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-                this.cc_name = cc_name
-                this.cpp_cc = cpp_cc
-                this.cfa_cc = cfa_cc
-        }
-}
-
-def compiler_from_params(cc) {
-        switch( cc ) {
-                case 'gcc-6':
-                        return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                break
-                case 'gcc-5':
-                        return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                break
-                case 'gcc-4.9':
-                        return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                break
-                case 'clang':
-                        return new CC_Desc('clang', 'clang++', 'gcc-6')
-                break
-                default :
-                        error "Unhandled compiler : ${cc}"
-        }
-}
-
-def architecture_from_params( arch ) {
-        switch( arch ) {
-                case 'x64':
-                        return '--host=x86_64'
-                break
-                case 'x86':
-                        return '--host=i386'
-                break
-                default :
-                        error "Unhandled architecture : ${arch}"
-        }
-}
-
-//===========================================================================================================
-// Main compilation routines
-//===========================================================================================================
-//Compilation script is done here but environnement set-up and error handling is done in main loop
-def checkout() {
-        build_stage('Checkout') {
-                //checkout the source code and clean the repo
-                checkout scm
-
-                //Clean all temporary files to make sure no artifacts of the previous build remain
-                sh 'git clean -fdqx'
-
-                //Reset the git repo so no local changes persist
-                sh 'git reset --hard'
-        }
-}
-
-def build() {
-        build_stage('Build') {
-
-                def install_dir = pwd tmp: true
-
-                //Output compiler version to help with debug
-                echo """C++ Compiler :"""
-                sh "which ${compiler.cpp_cc} && ${compiler.cpp_cc} --version"
-                echo """C   Compiler :"""
-                sh "which ${compiler.cfa_cc} && ${compiler.cfa_cc} --version"
-
-                //Configure the conpilation (Output is not relevant)
-                //Use the current directory as the installation target so nothing escapes the sandbox
-                //Also specify the compiler by hand
-                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
-
-                //Compile the project
-                sh 'make -j 8 --no-print-directory V=0 install'
-        }
-}
-
-def test() {
-        build_stage('Test') {
-
-                //Run the tests from the tests directory
-                if ( do_alltests ) {
-                        sh 'make -C src/tests all-tests debug=yes --no-print-directory'
-                        sh 'make -C src/tests all-tests debug=no --no-print-directory'
-                }
-                else {
-                        sh 'make -C src/tests --no-print-directory'
-                }
-        }
-}
-
-def benchmark() {
-        build_stage('Benchmark') {
-
-                if( !do_benchmark ) return
-
-                //Append bench results
-                sh 'make -C src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
-        }
-}
-
-def clean() {
-        build_stage('Cleanup') {
-
-                //do a maintainer-clean to make sure we need to remake from scratch
-                sh 'make maintainer-clean > /dev/null'
-        }
-}
-
-def build_doc() {
-        build_stage('Documentation') {
-
-                if( !do_doc ) return
-
-                dir ('doc/user') {
-                        make_doc()
-                }
-
-                dir ('doc/refrat') {
-                        make_doc()
-                }
-        }
-}
-
-def publish() {
-        build_stage('Publish') {
-
-                if( !do_publish ) return
-
-                //Then publish the results
-                sh 'curl -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
-        }
-}
-
-//===========================================================================================================
-//Routine responsible of sending the email notification once the build is completed
-//===========================================================================================================
-//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
-        //Configurations for email format
-        def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
-
-        def gitLog = 'Error retrieving git logs'
-        def gitDiff = 'Error retrieving git diff'
-
-        try {
-
-                sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
-                gitLog = readFile('GIT_LOG')
-
-                sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
-                gitDiff = readFile('GIT_DIFF')
-        }
-        catch (Exception error) {}
-
-        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
-generated because of a git hooks/post-receive script following
-a ref change was pushed to the repository containing
-the project "UNNAMED PROJECT".
-
-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.
-
-- Status --------------------------------------------------------------
-
-BUILD# ${env.BUILD_NUMBER} - ${status}
-
-- Log -----------------------------------------------------------------
-${gitLog}
------------------------------------------------------------------------
-Summary of changes:
-${gitDiff}
-"""
-
-        def email_to = "cforall@lists.uwaterloo.ca"
-
-        //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
-}
+def do_plot(boolean new_data, String file, PlotGroup group, boolean relative, String title) {
+
+        if(new_data) {
+                echo "Publishing new data"
+        }
+
+        def series = new_data ? [[
+                                file: "${file}.csv",
+                                exclusionValues: '',
+                                displayTableFlag: false,
+                                inclusionFlag: 'OFF',
+                                url: ''
+                        ]] : [];
+
+        echo "file is ${BuildDir}/benchmark/${file}.csv, group ${group}, title ${title}"
+        dir("${BuildDir}/benchmark/") {
+                plot csvFileName: "cforall-${env.BRANCH_NAME}-${file}.csv",
+                        csvSeries: series,
+                        group: "${group.name}",
+                        title: "${title}",
+                        style: 'lineSimple',
+                        exclZero: false,
+                        keepRecords: false,
+                        logarithmic: !relative && group.log,
+                        numBuilds: '120',
+                        useDescr: true,
+                        yaxis: group.unit,
+                        yaxisMaximum: '',
+                        yaxisMinimum: ''
+        }
+}