Changes in Jenkinsfile [05c34c3:84917e2]

File:

• Jenkinsfile (modified) (9 diffs)

Jenkinsfile

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