Index: Jenkinsfile_disabled
===================================================================
--- Jenkinsfile_disabled	(revision f53acdf88f0790f441b622ba4624c865224726a7)
+++ Jenkinsfile_disabled	(revision 99da2670a9c3077bcfe60c06fde4a115b84eccae)
@@ -2,7 +2,4 @@
 
 import groovy.transform.Field
-
-// For skipping stages
-import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
 
 //===========================================================================================================
@@ -85,5 +82,5 @@
 //===========================================================================================================
 def clean() {
-	build_stage('Cleanup', true) {
+	build_stage('Cleanup') {
 		// clean the build by wipping the build directory
 		dir(BuildDir) {
@@ -95,5 +92,5 @@
 //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,27 +103,5 @@
 
 def build() {
-	// build_stage('Build', 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"
-
-	// 		//Compile the project
-	// 		sh 'make -j 8 --no-print-directory'
-	// 	}
-	// }
-
-	debug = true
-	release = Settings.RunAllTests || Settings.RunBenchmark
-	build_stage('Build : configure', true) {
+	build_stage('Build') {
 		// Build outside of the src tree to ease cleaning
 		dir (BuildDir) {
@@ -143,31 +118,6 @@
 			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"
+			//Compile the project
+			sh 'make -j 8 --no-print-directory'
 		}
 	}
@@ -175,16 +125,15 @@
 
 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'
+			}
 		}
 	}
@@ -192,5 +141,8 @@
 
 def benchmark() {
-	build_stage('Benchmark', Settings.RunBenchmark) {
+	build_stage('Benchmark') {
+
+		if( !Settings.RunBenchmark ) return
+
 		dir (BuildDir) {
 			//Append bench results
@@ -201,5 +153,8 @@
 
 def build_doc() {
-	build_stage('Documentation', Settings.BuildDocumentation) {
+	build_stage('Documentation') {
+
+		if( !Settings.BuildDocumentation ) return
+
 		dir ('doc/user') {
 			make_doc()
@@ -213,5 +168,5 @@
 
 def publish() {
-	build_stage('Publish', true) {
+	build_stage('Publish') {
 
 		if( Settings.Publish && !Settings.RunBenchmark ) { echo 'No results to publish!!!' }
@@ -457,12 +412,8 @@
 }
 
-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)
 }