Changes in Jenkinsfile [d56c05d0:245510f]

File:

• Jenkinsfile (modified) (7 diffs)

Jenkinsfile

@@ -5 +5 @@
 //===========================================================================================================
 //Compilation script is done here but environnement set-up and error handling is done in main loop
-def cfa_build(boolean full_build) {
+def cfa_build() {
         build_stage 'Checkout'
                 def install_dir = pwd tmp: true
                 //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'
 
@@ -30 +26 @@
         build_stage 'Test'
 
-                //Run the tests from the tests directory
+                //Run the tests from the example directory
                 dir ('src/tests') {
-                        if (full_build) {
-                                sh 'make all-tests'
-                        }
-                        else {
-                                sh 'make'
-                        }
+                        sh './runTests.sh'
                 }
 
@@ -44 +35 @@
                 //do a maintainer-clean to make sure we need to remake from scratch
                 sh 'make maintainer-clean > /dev/null'
-}
-
-def make_doc() {
-        def err = null
-
-        try {
-                sh 'make clean > /dev/null'
-                sh 'make > /dev/null 2>&1'
-        }
-
-        catch (Exception caughtError) {
-                //rethrow error later
-                err = caughtError
-
-                sh 'cat *.log'
-        }
-
-        finally {
-                /* Must re-throw exception to propagate error */
-                if (err) {
-                        throw err
-                }
-        }
-}
-
-def doc_build() {
-        stage 'Documentation'
-
-                status_prefix = 'Documentation'
-
-                dir ('doc/user') {
-                        make_doc()
-                }
-
-                dir ('doc/refrat') {
-                        make_doc()
-                }
 }
 
@@ -163 +117 @@
         try {
                 //Prevent the build from exceeding 30 minutes
-                timeout(60) {
+                timeout(30) {
 
                         //Wrap build to add timestamp to command line
@@ -186 +140 @@
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                                cfa_build(doPromoteBuild2DoLang)
-
-                                //Compile latex documentation
-                                doc_build()
+                                cfa_build()
+
+                                //Compile using gcc-5
+                                currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+                                cfa_build()
+
+                                //Compile using gcc-4.9
+                                currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+                                cfa_build()
 
                                 if( doPromoteBuild2DoLang ) {
-                                        //Compile using gcc-5
-                                        currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                                        cfa_build(true)
-
-                                        //Compile using gcc-4.9
-                                        currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                                        cfa_build(true)
-
-                                        //Push latest changes to do-lang repo
                                         push_build()
                                 }
@@ -235 +185 @@
 //===========================================================================================================
 def notify_result(boolean promote, Exception err, String status, boolean log) {
-        echo 'Build completed, sending result notification'
         if(promote)     {
                 if( err ) {
@@ -275 +224 @@
         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) {}
+        sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
+        def gitLog = readFile('GIT_LOG')
+
+        sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
+        def gitDiff = readFile('GIT_DIFF')
 
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"