Changeset 5e44ac2 for Jenkinsfile

Timestamp:

Aug 15, 2018, 1:58:02 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

90cac45

Parents:

d7d63e5 (diff), 7bd4cc9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into demangler

File:

• Jenkinsfile (modified) (8 diffs)

Jenkinsfile

@@ -128 +128 @@
                                         description: 'If true, jenkins also runs benchmarks',           \
                                         name: 'pRunBenchmark',                                                          \
-                                        defaultValue: true,                                                             \
+                                        defaultValue: false,                                                            \
                                 ],                                                                                              \
                                 [$class: 'BooleanParameterDefinition',                                                  \
@@ -277 +277 @@
                         //Use the current directory as the installation target so nothing escapes the sandbox
                         //Also specify the compiler by hand
-                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
+                        targets=""
+                        if(do_alltests) {
+                                targets="--with-target-hosts='host:debug,host:nodebug'"
+                        } else {
+                                targets="--with-target-hosts='host:debug'"
+                        }
+
+                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} ${targets} --with-backend-compiler=${compiler.cfa_cc} --quiet"
 
                         //Compile the project
@@ -291 +298 @@
                         //Run the tests from the tests directory
                         if ( do_alltests ) {
-                                sh 'make --no-print-directory -C src/tests all-tests debug=yes'
-                                sh 'make --no-print-directory -C src/tests all-tests debug=no '
+                                sh 'make --no-print-directory -C tests all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests all-tests debug=no '
                         }
                         else {
-                                sh 'make --no-print-directory -C src/tests'
+                                sh 'make --no-print-directory -C tests'
                         }
                 }
@@ -308 +315 @@
                 dir (builddir) {
                         //Append bench results
-                        sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
+                        sh "make --no-print-directory -C benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
                 }
         }
@@ -341 +348 @@
 //Routine responsible of sending the email notification once the build is completed
 //===========================================================================================================
+def gitBranchUpdate(String gitRefOldValue, String gitRefNewValue) {
+        def update = ""
+        sh "git rev-list ${gitRefOldValue}..${gitRefNewValue} > GIT_LOG";
+        readFile('GIT_LOG').eachLine { rev ->
+                sh "git cat-file -t ${rev} > GIT_TYPE"
+                def type = readFile('GIT_TYPE')
+
+                update += "       via  ${rev} (${type})\n"
+        }
+        def rev = gitRefOldValue
+        sh "git cat-file -t ${rev} > GIT_TYPE"
+        def type = readFile('GIT_TYPE')
+
+        update += "      from  ${rev} (${type})\n"
+        return update
+
+def output=readFile('result').trim()
+echo "output=$output";
+}
+
 //Standard build email notification
 def email(String status, boolean log, boolean bIsSandbox) {
@@ -349 +376 @@
         def gitLog = 'Error retrieving git logs'
         def gitDiff = 'Error retrieving git diff'
+        def gitUpdate = 'Error retrieving update'
 
         try {
+                gitUpdate = gitBranchUpdate(gitRefOldValue, gitRefNewValue)
 
                 sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
@@ -358 +387 @@
                 gitDiff = readFile('GIT_DIFF')
         }
-        catch (Exception error) {}
+        catch (Exception error) {
+                echo error.toString()
+                echo error.getMessage()
+        }
 
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"
@@ -367 +399 @@
 
 The branch ${env.BRANCH_NAME} has been updated.
-   via  ${gitRefOldValue} (commit)
-  from  ${gitRefNewValue} (commit)
+${gitUpdate}
 
 Check console output at ${env.BUILD_URL} to view the results.