Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 6b6c26e4d4c15cdc75225116b8b6563534f4bf7d)
+++ Jenkinsfile	(revision aa8e83015d500cf142bb18da8aa36ea968cdc7f3)
@@ -10,75 +10,70 @@
 //===========================================================================================================
 
-node('master') {
-	// Globals
-	BuildDir  = pwd tmp: true
-	SrcDir    = pwd tmp: false
-	Settings  = null
-	StageName = ''
-
-	// Local variables
-	def err = null
-	def log_needed = false
-
-	currentBuild.result = "SUCCESS"
-
-	try {
-		//Wrap build to add timestamp to command line
-		wrap([$class: 'TimestamperBuildWrapper']) {
-
-			Settings = prepare_build()
-
-			node(Settings.Architecture.node) {
-				BuildDir  = pwd tmp: true
-				SrcDir    = pwd tmp: false
-
-				clean()
-
-				checkout()
-
-				build()
-
-				test()
-
-				benchmark()
-
-				build_doc()
-
-				publish()
-			}
-
-			// Update the build directories when exiting the node
+// Globals
+BuildDir  = null
+SrcDir    = null
+Settings  = null
+StageName = ''
+
+// Local variables
+def err = null
+def log_needed = false
+
+currentBuild.result = "SUCCESS"
+
+try {
+	//Wrap build to add timestamp to command line
+	wrap([$class: 'TimestamperBuildWrapper']) {
+
+		Settings = prepare_build()
+
+		node(Settings.Architecture.node) {
 			BuildDir  = pwd tmp: true
 			SrcDir    = pwd tmp: false
-		}
-	}
-
-	//If an exception is caught we need to change the status and remember to
-	//attach the build log to the email
-	catch (Exception caughtError) {
-		//rethrow error later
-		err = caughtError
-
-		echo err.toString()
-
-		//An error has occured, the build log is relevent
-		log_needed = true
-
-		//Store the result of the build log
-		currentBuild.result = "${StageName} FAILURE".trim()
-	}
-
-	finally {
-		//Send email with final results if this is not a full build
-		email(log_needed)
-
-		echo 'Build Completed'
-
-		/* Must re-throw exception to propagate error */
-		if (err) {
-			throw err
-		}
-	}
-}
+
+			clean()
+
+			checkout()
+
+			build()
+
+			test()
+
+			benchmark()
+
+			build_doc()
+
+			publish()
+		}
+	}
+}
+
+//If an exception is caught we need to change the status and remember to
+//attach the build log to the email
+catch (Exception caughtError) {
+	//rethrow error later
+	err = caughtError
+
+	echo err.toString()
+
+	//An error has occured, the build log is relevent
+	log_needed = true
+
+	//Store the result of the build log
+	currentBuild.result = "${StageName} FAILURE".trim()
+}
+
+finally {
+	//Send email with final results if this is not a full build
+	email(log_needed)
+
+	echo 'Build Completed'
+
+	/* Must re-throw exception to propagate error */
+	if (err) {
+		throw err
+	}
+}
+
 //===========================================================================================================
 // Main compilation routines