[couchdb] branch jenkins-dynamic-matrix updated: More experiments

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch jenkins-dynamic-matrix
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-dynamic-matrix by this push:
     new 891f3b0  More experiments
891f3b0 is described below

commit 891f3b0983b8ad41d39612978f6be697680fb5aa
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 17 20:33:49 2022 -0500

    More experiments
---
 build-aux/Jenkinsfile.full | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index e57ae9a..9a22eeb 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -156,7 +156,8 @@ def generateNativeStage(platform) {
               }
             }
           }
-          catch (exc) {
+          catch (err) {
+            echo "Build failed: {$err}"
             dir( "${platform}/build/couchdb" ) {
               sh 'make build-report'
             }
@@ -165,7 +166,7 @@ def generateNativeStage(platform) {
             junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
             sh 'killall -9 beam.smp || true'
             dir( "${COUCHDB_IO_LOG_DIR}" ) { deleteDir() }
-            cleanWs()
+            deleteDir()
           }
         }
       }
@@ -183,8 +184,8 @@ def generateContainerStage(platform) {
             timeout(time: 90, unit: "MINUTES") {
               withEnv(['PLATFORM='+platform]) {
                 stage("${meta[platform].name} - build & test") {
+                  sh( script: 'rm -rf apache-couchdb-*', label: 'Clean workspace' )
                   try {
-                    sh( script: 'rm -rf apache-couchdb-*', label: 'Clean workspace' )
                     unstash 'tarball'
                     sh( script: unpack, label: 'Unpack tarball' )
                     dir( "${platform}/build/couchdb" ) {
@@ -196,7 +197,8 @@ def generateContainerStage(platform) {
                       sh 'make mango-test'
                     }
                   }
-                  catch (exc) {
+                  catch (err) {
+                    echo "Build failed: {$err}"
                     sh 'ls -l ${WORKSPACE}'
                     dir( "${platform}/build/couchdb" ) {
                       sh 'pwd; ls -l'
@@ -206,7 +208,7 @@ def generateContainerStage(platform) {
                   finally {
                     junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
                     dir( "${COUCHDB_IO_LOG_DIR}" ) { deleteDir() }
-                    cleanWs()
+                    deleteDir()
                   }
                 }
 
@@ -218,11 +220,12 @@ def generateContainerStage(platform) {
                     sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
                     archiveArtifacts artifacts: 'pkgs/**', fingerprint: true, onlyIfSuccessful: true
                   }
-                  catch (exc) {
+                  catch (err) {
+                    echo "Packaging failed: {$err}"
                     sh 'ls -l ${WORKSPACE}'
                   }
                   finally {
-                    cleanWs()
+                    deleteDir()
                   }
                 }
               }