Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 9beae231a8f66079cf0a0e4ba3042a55aa7470dd)
+++ Jenkinsfile	(revision 0ef06b6dcc0208ee9962c59001a8d55e882ff2a4)
@@ -7,9 +7,12 @@
 
 	boolean bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
-	boolean bIsFullBuild
 	def err = null
 	def log_needed = false
+
+	bIsFullBuild = false
+	architectureFlag = ''
+	status_prefix = ''
+
 	currentBuild.result = "SUCCESS"
-	status_prefix = ''
 
 	try {
@@ -20,33 +23,5 @@
 			wrap([$class: 'TimestamperBuildWrapper']) {
 
-				collect_git_info()
-
-				properties ([ 									\
-					[$class: 'ParametersDefinitionProperty', 				\
-						parameterDefinitions: [ 					\
-						[$class: 'BooleanParameterDefinition',  			\
-						  defaultValue: false,  					\
-						  description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
-						  name: 'isFullBuild' 					\
-						], 								\
-						[$class: 'ChoiceParameterDefinition',				\
-						  choices: '64-bit\n32-bit',					\
-						  defaultValue: '64-bit',					\
-						  description: 'The architecture to use for compilation',	\
-						  name: 'buildArchitecture'					\
-						]]								\
-					]])
-
-				bIsFullBuild = isFullBuild == 'true'
-				architectureFlag = ''
-				if (buildArchitecture == '64-bit') {
-					architectureFlag = '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
-				} else if (buildArchitecture == '32-bit'){
-					architectureFlag = '--host=i386 CXXFLAGS="-m32" CFAFLAGS="-m32"'
-				} else {
-					architectureFlag = 'ERROR'
-				}
-
-				echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
+				prepare_build()
 
 				//Compile using gcc-4.9
@@ -146,4 +121,37 @@
 	gitRefOldValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][1]
 	gitRefNewValue = (git_reflog =~ /moving from (.+) to (.+)/)[0][2]
+}
+
+def prepare_build() {
+	properties ([ 									\
+		[$class: 'ParametersDefinitionProperty', 				\
+			parameterDefinitions: [ 					\
+			[$class: 'BooleanParameterDefinition',  			\
+				defaultValue: false,  					\
+				description: 'If true, the build will be promoted to the do-lang git repository (on successful builds only)', \
+				name: 'isFullBuild' 					\
+			], 								\
+			[$class: 'ChoiceParameterDefinition',				\
+				choices: '64-bit\n32-bit',					\
+				defaultValue: '64-bit',					\
+				description: 'The architecture to use for compilation',	\
+				name: 'buildArchitecture'					\
+			]]								\
+		]])
+
+	bIsFullBuild = isFullBuild == 'true'
+	architectureFlag = ''
+	if (buildArchitecture == '64-bit') {
+		architectureFlag = '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
+	} else if (buildArchitecture == '32-bit'){
+		architectureFlag = '--host=i386 CXXFLAGS="-m32" CFAFLAGS="-m32"'
+	} else {
+		architectureFlag = 'ERROR'
+	}
+
+	echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"
+
+	collect_git_info()
+
 }