Changeset 21eb693 for Jenkinsfile

Timestamp:

Jun 20, 2016, 3:05:35 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

554a0db

Parents:

a0dcd2e (diff), 0a346e5 (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' of plg2:software/cfa/cfa-cc

Conflicts:

src/tests/Context.c

File:

• Jenkinsfile (modified) (5 diffs)

Jenkinsfile

@@ -5 +5 @@
 //===========================================================================================================
 //Compilation script is done here but environnement set-up and error handling is done in main loop
-def cfa_build() {
+def cfa_build(boolean full_build) {
         build_stage 'Checkout'
                 def install_dir = pwd tmp: true
                 //checkout the source code and clean the repo
                 checkout scm
+
+                //Clean all temporary files to make sure no artifacts of the previous build remain
                 sh 'git clean -fdqx'
+
+                //Reset the git repo so no local changes persist
                 sh 'git reset --hard'
 
@@ -26 +30 @@
         build_stage 'Test'
 
-                //Run the tests from the example directory
+                //Run the tests from the tests directory
                 dir ('src/tests') {
-                        sh './runTests.sh'
+                        if (full_build) {
+                                sh 'python test.py --all'
+                        }
+                        else {
+                                sh './runTests.sh'
+                        }
                 }
 
@@ -140 +149 @@
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                                cfa_build()
+                                cfa_build(doPromoteBuild2DoLang)
 
                                 //Compile using gcc-5
                                 currentCC = new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                                cfa_build()
+                                cfa_build(doPromoteBuild2DoLang)
 
                                 //Compile using gcc-4.9
                                 currentCC = new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                                cfa_build()
+                                cfa_build(doPromoteBuild2DoLang)
 
                                 if( doPromoteBuild2DoLang ) {
@@ -185 +194 @@
 //===========================================================================================================
 def notify_result(boolean promote, Exception err, String status, boolean log) {
+        echo 'Build completed, sending result notification'
         if(promote)     {
                 if( err ) {
@@ -224 +234 @@
         def project_name = (env.JOB_NAME =~ /(.+)\/.+/)[0][1].toLowerCase()
 
-        sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
-        def gitLog = readFile('GIT_LOG')
-
-        sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
-        def gitDiff = readFile('GIT_DIFF')
+        def gitLog = 'Error retrieving git logs'
+        def gitDiff = 'Error retrieving git diff'
+
+        try {
+
+                sh "git rev-list --format=short ${gitRefOldValue}...${gitRefNewValue} > GIT_LOG"
+                gitLog = readFile('GIT_LOG')
+
+                sh "git diff --stat ${gitRefNewValue} ${gitRefOldValue} > GIT_DIFF"
+                gitDiff = readFile('GIT_DIFF')
+        }
+        catch (Exception error) {}
 
         def email_subject = "[${project_name} git][BUILD# ${env.BUILD_NUMBER} - ${status}] - branch ${env.BRANCH_NAME}"