Changeset 0ef06b6 for Jenkinsfile

Timestamp:

Feb 16, 2017, 12:09:30 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ae28ee2

Parents:

9beae23

Message:

Jenkinsfile - moved build preparation in it's own branch

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -7 +7 @@
 
         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 +23 @@
                         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 +121 @@
         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()
+
 }