You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/01/18 00:41:19 UTC
[couchdb] 01/02: Fixes
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 01b300096fd0dd14635344dc49752c14612ec8ae
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 17 19:35:54 2022 -0500
Fixes
---
build-aux/Jenkinsfile.full | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 1c0dc90..b33d2ff 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -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()
}
}
}