[couchdb] 02/02: Use gmake for build-report, streamline debugging

[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

commit 0fab3b75adaa8600587ed4b73f58029bd7b4d582
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 17 23:18:58 2022 -0500

    Use gmake for build-report, streamline debugging
---
 build-aux/Jenkinsfile.full | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index f5deb71..1c65fa5 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -121,8 +121,6 @@ meta = [
   ]
 ]
 
-gnu_make = ['freebsd': 'gmake', 'macos': 'make']
-
 // Credit to https://stackoverflow.com/a/69222555 for this technique.
 // We can use the scripted pipeline syntax to dynamically generate stages,
 // and inject them into a map that we pass to the `parallel` step in a script.
@@ -145,8 +143,6 @@ def generateNativeStage(platform) {
                 ]) {
               sh( script: unpack, label: 'Unpack tarball' )
               dir( "${platform}/build/couchdb" ) {
-                sh 'pwd'
-                sh 'ls -l'
                 sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
                 sh '$MAKE'
                 sh '$MAKE eunit'
@@ -158,8 +154,10 @@ def generateNativeStage(platform) {
           }
           catch (err) {
             echo "Build failed: {$err}"
+            sh 'ls -l ${WORKSPACE}'
             dir( "${platform}/build/couchdb" ) {
-              sh 'make build-report'
+              sh 'ls -l'
+              sh "${meta[platform].gnu_make} build-report"
             }
           }
           finally {
@@ -210,7 +208,7 @@ def generateContainerStage(platform) {
                     echo "Build failed: {$err}"
                     sh 'ls -l ${WORKSPACE}'
                     dir( "${platform}/build/couchdb" ) {
-                      sh 'pwd; ls -l'
+                      sh 'ls -l'
                       sh 'make build-report'
                     }
                   }
@@ -222,7 +220,6 @@ def generateContainerStage(platform) {
 
                 stage("${meta[platform].name} - package") {
                   try {
-                    sh 'pwd; ls -l'
                     unstash 'tarball'
                     sh( script: make_packages, label: 'Build packages' )
                     sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
@@ -233,7 +230,7 @@ def generateContainerStage(platform) {
                     sh 'ls -l ${WORKSPACE}'
                   }
                   finally {
-                    deleteDir()
+                    sh 'rm -rf ${WORKSPACE}/*'
                   }
                 }
               }
@@ -245,16 +242,6 @@ def generateContainerStage(platform) {
   }
 }
 
-// Haven't yet included this cleanup action to take place after the combo of container stages
-//       post {
-//         cleanup {
-//           sh 'rm -rf ${WORKSPACE}/*'
-//         }
-//       }
-//     }
-//   }
-// }
-
 def parallelStagesMap = meta.collectEntries { key, values ->
   if (values.image) {
     ["${key}": generateContainerStage(key)]