[couchdb] branch jenkins-dynamic-matrix updated: Fixes

[kocolosk]

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 a9c392b  Fixes
a9c392b is described below

commit a9c392b313e05e00f775616fe581df3550ee65fb
Author: Adam Kocoloski <kocol...@apache.org>
AuthorDate: Mon Jan 17 19:35:54 2022 -0500

    Fixes
---
 build-aux/Jenkinsfile.full | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 1c0dc90..6b5956b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -128,7 +128,7 @@ gnu_make = ['freebsd': 'gmake', 'macos': 'make']
 // and inject them into a map that we pass to the `parallel` step in a script.
 // It's arguably more difficult to follow than a pure declarative pipeline, but
 // the opportunity to keep things DRY seems worthwhile. -APK
-def generateNativeStage(platform) {
+def generateNativeStage(meta[platform].name) {
   return {
     stage("${meta[platform].name} - build & test") {
       node(platform) {
@@ -164,7 +164,7 @@ def generateNativeStage(platform) {
           finally {
             junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, 
**/src/mango/nosetests.xml, **/test/javascript/junit.xml'
             sh 'killall -9 beam.smp || true'
-            deleteDir("${COUCHDB_IO_LOG_DIR}")
+            dir( "${COUCHDB_IO_LOG_DIR}" ) { deleteDir() }
             cleanWs()
           }
         }
@@ -175,7 +175,7 @@ def generateNativeStage(platform) {
 
 def generateContainerStage(platform) {
   return {
-    stage(platform) {
+    stage(meta[platform].name) {
       // TODO allow for other labels, e.g. arm64v8
       node('docker') {
         docker.withRegistry('https://docker.io/', 'dockerhub_creds') {
@@ -205,7 +205,7 @@ def generateContainerStage(platform) {
                   }
                   finally {
                     junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, 
**/src/mango/nosetests.xml, **/test/javascript/junit.xml'
-                    deleteDir("${COUCHDB_IO_LOG_DIR}")
+                    dir( "${COUCHDB_IO_LOG_DIR}" ) { deleteDir() }
                     cleanWs()
                   }
                 }
@@ -222,7 +222,7 @@ def generateContainerStage(platform) {
                     sh 'ls -l ${WORKSPACE}'
                   }
                   finally {
-                    cleamWs()
+                    cleanWs()
                   }
                 }
               }