Index: Jenkinsfile
===================================================================
--- Jenkinsfile	(revision 95fdb0a4a39c875125e1a0a832a8964ceeeffeb5)
+++ Jenkinsfile	(revision bd34bcf544405c60b796e8a62cf13d0f0385f331)
@@ -10,11 +10,11 @@
 	def log_needed = false
 
-	compiler 		= compiler_from_params()
-	architecture 	= architecture_from_params()
+	compiler 		= null
+	architecture 	= ''
 	
-	do_alltests		= param_allTests 	.toBoolean()
-	do_benchmark	= param_benchmark .toBoolean()
-	do_doc		= param_doc 	.toBoolean()
-	do_publish
+	do_alltests		= false
+	do_benchmark	= false
+	do_doc		= false
+	do_publish		= false
 
 	currentBuild.result = "SUCCESS"
@@ -82,17 +82,4 @@
 // Helper classes/variables/routines
 //===========================================================================================================
-//Description of a compiler (Must be serializable since pipelines are persistent)
-class CC_Desc implements Serializable {
-	public String cc_name
-	public String cpp_cc
-	public String cfa_backend_cc
-
-	CC_Desc(String cc_name, String cpp_cc, String cfa_backend_cc) {
-		this.cc_name = cc_name
-		this.cpp_cc = cpp_cc
-		this.cfa_backend_cc = cfa_backend_cc
-	}
-}
-
 //Helper routine to collect information about the git history
 def collect_git_info() {
@@ -151,6 +138,6 @@
 		]])
 
-	compiler 		= compiler_from_params()
-	architecture 	= architecture_from_params()
+	compiler 		= compiler_from_params( param_compiler )
+	architecture 	= architecture_from_params( param_arch )
 
 	do_alltests		= param_allTests 	.toBoolean()
@@ -178,4 +165,49 @@
 	finally {
 		if (err) throw err // Must re-throw exception to propagate error
+	}
+}
+
+//Description of a compiler (Must be serializable since pipelines are persistent)
+class CC_Desc implements Serializable {
+	public String cc_name
+	public String cpp_cc
+	public String cfa_backend_cc
+
+	CC_Desc(String cc_name, String cpp_cc, String cfa_backend_cc) {
+		this.cc_name = cc_name
+		this.cpp_cc = cpp_cc
+		this.cfa_backend_cc = cfa_backend_cc
+	}
+}
+
+def compiler_from_params(cc) {
+	switch( cc ) {
+		case 'gcc-6':
+			return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
+		break
+		case 'gcc-5':
+			return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
+		break
+		case 'gcc-4.9':
+			return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
+		break
+		case 'clang':
+			return new CC_Desc('gcc-6', 'clang', 'gcc-6')
+		break
+		default 
+			error 'Unhandled compiler'
+	}
+}
+
+def architecture_from_params( arch ) {
+	switch( arch ) {
+		case '64-bit':
+			return '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"'
+		break
+		case '32-bit':
+			return '--host=i386   CXXFLAGS="-m32" CFAFLAGS="-m32"'
+		break
+		default 
+			error 'Unhandled architecture'
 	}
 }