Changes in Jenkinsfile [84917e2:05c34c3]

File:

• Jenkinsfile (modified) (9 diffs)

Jenkinsfile

@@ -2 +2 @@
 
 import groovy.transform.Field
+
+// For skipping stages
+import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -82 +85 @@
 //===========================================================================================================
 def clean() {
-        build_stage('Cleanup') {
+        build_stage('Cleanup', true) {
                 // clean the build by wipping the build directory
                 dir(BuildDir) {
@@ -92 +95 @@
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
-        build_stage('Checkout') {
+        build_stage('Checkout', true) {
                 //checkout the source code and clean the repo
                 final scmVars = checkout scm
@@ -103 +106 @@
 
 def build() {
-        build_stage('Build') {
+        build_stage('Build', true) {
                 // Build outside of the src tree to ease cleaning
                 dir (BuildDir) {
@@ -125 +128 @@
 
 def test() {
-        build_stage('Test') {
-
+        build_stage('Test: short', !Settings.RunAllTests) {
                 dir (BuildDir) {
                         //Run the tests from the tests directory
-                        if ( Settings.RunAllTests ) {
-                                sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=yes'
-                                sh 'make --no-print-directory -C tests timeouts="--timeout=1200" all-tests debug=no '
-                        }
-                        else {
-                                sh 'make --no-print-directory -C tests'
-                        }
+                        sh 'make --no-print-directory -C tests'
+                }
+        }
+
+        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'
+                        sh 'make --no-print-directory -C tests timeouts="--timeout=600 --global-timeout=14400" all-tests debug=no '
                 }
         }
@@ -141 +145 @@
 
 def benchmark() {
-        build_stage('Benchmark') {
-
-                if( !Settings.RunBenchmark ) return
-
+        build_stage('Benchmark', Settings.RunBenchmark) {
                 dir (BuildDir) {
                         //Append bench results
@@ -153 +154 @@
 
 def build_doc() {
-        build_stage('Documentation') {
-
-                if( !Settings.BuildDocumentation ) return
-
+        build_stage('Documentation', Settings.BuildDocumentation) {
                 dir ('doc/user') {
                         make_doc()
@@ -168 +166 @@
 
 def publish() {
-        build_stage('Publish') {
+        build_stage('Publish', true) {
 
                 if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
@@ -412 +410 @@
 }
 
-def build_stage(String name, Closure block ) {
+def build_stage(String name, boolean run, Closure block ) {
         StageName = name
         echo " -------- ${StageName} -------- "
-        stage(name, block)
+        if(run) {
+                stage(name, block)
+        } else {
+                stage(name) { Utils.markStageSkippedForConditional(STAGE_NAME) }
+        }
 }