Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 6ebc13f8db653fa16139c298e7dd18067bafaaff)
+++ Jenkinsfile	(revision c802eb883340a94cf9ba158c4c21e09873406253)
@@ -4,9 +4,9 @@
 // Main loop of the compilation
 //===========================================================================================================
-node ('master'){
-
+
+node('master') {
 	// Globals
-	BuildDir  = pwd tmp: true
-	SrcDir    = pwd tmp: false
+	BuildDir  = null
+	SrcDir    = null
 	Settings  = null
 	StageName = ''
@@ -26,19 +26,24 @@
 			Settings = prepare_build()
 
-			clean()
-
-			checkout()
-
-			notify_server(0)
-
-			build()
-
-			test()
-
-			benchmark()
-
-			build_doc()
-
-			publish()
+			node(Settings.Architecture.node) {
+				BuildDir  = pwd tmp: true
+				SrcDir    = pwd tmp: false
+
+				clean()
+
+				checkout()
+
+				notify_server(0)
+
+				build()
+
+				test()
+
+				benchmark()
+
+				build_doc()
+
+				publish()
+			}
 
 			notify_server(45)
@@ -75,5 +80,4 @@
 	}
 }
-
 //===========================================================================================================
 // Main compilation routines
@@ -250,8 +254,10 @@
 	public String name
 	public String flags
-
-	Arch_Desc(String name, String flags) {
+	public String node
+
+	Arch_Desc(String name, String flags, String node) {
 		this.name  = name
 		this.flags = flags
+		this.node  = node
 	}
 }
@@ -292,8 +298,8 @@
 		switch( param.Architecture ) {
 			case 'x64':
-				this.Architecture = new Arch_Desc('x64', '--host=x86_64')
+				this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
 			break
 			case 'x86':
-				this.Architecture = new Arch_Desc('x86', '--host=i386')
+				this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
 			break
 			default :