Changeset 82c6072

Timestamp:

Jul 31, 2018, 3:46:27 PM (6 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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

5f08ac2f

Parents:

ad486c5b (diff), 843002c9 (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 'jenkins-sandbox'

Files:

• Jenkins/FullBuild (modified) (1 diff)
• Jenkinsfile (modified) (13 diffs)
• src/tests/pybin/tools.py (modified) (1 diff)

Jenkins/FullBuild

@@ -87 +87 @@
 
         if(result.result != 'SUCCESS') {
-                sh("wget -q -O - ${result.absoluteUrl}/consoleText")
+                sh("wget -q -O - http://localhost:8084/job/Cforall/job/master/${result.number}/consoleText")
                 error(result.result)
         }

Jenkinsfile

@@ -22 +22 @@
         do_sendemail    = true
 
+        builddir = pwd tmp: true
+        srcdir   = pwd tmp: false
+
         currentBuild.result = "SUCCESS"
 
@@ -32 +35 @@
                         prepare_build()
 
+                        clean()
+
                         checkout()
 
@@ -41 +46 @@
 
                         benchmark()
-
-                        clean()
 
                         build_doc()
@@ -67 +70 @@
         finally {
                 //Send email with final results if this is not a full build
-                if( do_sendemail && !bIsSandbox ) {
+                if( do_sendemail ) {
                         echo 'Notifying users of result'
-                        email(currentBuild.result, log_needed)
+                        email(currentBuild.result, log_needed, bIsSandbox)
                 }
 
@@ -155 +158 @@
         do_sendemail    = ! (pSilent == 'true')
 
+        collect_git_info()
+
+        def full = do_alltests ? " (Full)" : ""
+        currentBuild.description = "Cforall ${gitRefName} ${compiler.cc_name}:${arch_name}${full}"
+
         echo """Compiler              : ${compiler.cc_name} (${compiler.cpp_cc}/${compiler.cfa_cc})
 Architecture            : ${arch_name}
@@ -164 +172 @@
 Silent                  : ${ pSilent.toString() }
 """
-
-        collect_git_info()
 }
 
@@ -241 +247 @@
 // Main compilation routines
 //===========================================================================================================
+def clean() {
+        build_stage('Cleanup') {
+                // clean the build by wipping the build directory
+                dir(builddir) {
+                        deleteDir()
+                }
+
+                //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'
+        }
+}
+
 //Compilation script is done here but environnement set-up and error handling is done in main loop
 def checkout() {
@@ -246 +267 @@
                 //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'
         }
 }
@@ -257 +272 @@
 def build() {
         build_stage('Build') {
-
-                def install_dir = pwd tmp: true
-
                 // Build outside of the src tree to ease cleaning
-                sh "mkdir -p build"
-                dir ('build') {
+                dir (builddir) {
                         //Configure the conpilation (Output is not relevant)
                         //Use the current directory as the installation target so nothing escapes the sandbox
                         //Also specify the compiler by hand
-                        sh "../configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+                        sh "${srcdir}/configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --enable-silent-rules --quiet"
 
                         //Compile the project
@@ -277 +288 @@
         build_stage('Test') {
 
-                //Run the tests from the tests directory
-                if ( do_alltests ) {
-                        sh 'make -C build/src/tests all-tests debug=yes --no-print-directory'
-                        sh 'make -C build/src/tests all-tests debug=no --no-print-directory'
-                }
-                else {
-                        sh 'make -C build/src/tests --no-print-directory'
+                dir (builddir) {
+                        //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 '
+                        }
+                        else {
+                                sh 'make --no-print-directory -C src/tests'
+                        }
                 }
         }
@@ -293 +306 @@
                 if( !do_benchmark ) return
 
-                //Append bench results
-                sh 'make -C build/src/benchmark --no-print-directory jenkins githash=' + gitRefNewValue + ' arch=' + arch_name + ' | tee bench.json'
-        }
-}
-
-def clean() {
-        build_stage('Cleanup') {
-                // clean the build by wipping the build directory
-                sh 'rm -rf build'
+                dir (builddir) {
+                        //Append bench results
+                        sh "make --no-print-directory -C src/benchmark jenkins githash=${gitRefNewValue} arch=${arch_name} | tee ${srcdir}/bench.json"
+                }
         }
 }
@@ -334 +342 @@
 //===========================================================================================================
 //Standard build email notification
-def email(String status, boolean log) {
+def email(String status, boolean log, boolean bIsSandbox) {
         //Since tokenizer doesn't work, figure stuff out from the environnement variables and command line
         //Configurations for email format
@@ -377 +385 @@
         def email_to = "cforall@lists.uwaterloo.ca"
 
-        //send email notification
-        emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
-}
+        if( !bIsSandbox ) {
+                //send email notification
+                emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
+        } else {
+                echo "Would send email to: ${email_to}"
+                echo "With title: ${email_subject}"
+                echo "Content: \n${email_body}"
+        }
+}

src/tests/pybin/tools.py

@@ -48 +48 @@
                 return False
 
-        return match.group(1) == "ASCII text"
+        return match.group(1).startswith("ASCII text")
 
 # Remove 1 or more files silently