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 19:25:56 UTC
[couchdb] 02/02: See if setting build result is needed
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-dynamic-matrix-throwaway
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f6c8c7440599c1ae06fbd280a61398fa1da6d276
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 14:25:40 2022 -0500
See if setting build result is needed
---
build-aux/Jenkinsfile.full | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index aaf64f2..01e966b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -126,7 +126,7 @@ def generateNativeStage(platform) {
dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh '$MAKE'
- sh "${platform} == \"macos\" && false"
+ sh "\"${platform}\" == \"macos\" && false"
sh '$MAKE eunit'
sh '$MAKE elixir-suite'
sh '$MAKE exunit'
@@ -135,7 +135,6 @@ def generateNativeStage(platform) {
}
}
catch (err) {
- currentBuild.result = 'FAILURE'
sh 'ls -l ${WORKSPACE}'
withEnv([
'HOME='+pwd(),
@@ -147,7 +146,7 @@ def generateNativeStage(platform) {
sh '${MAKE} build-report'
}
}
- error("{$err}")
+ error("Build step failed with error: ${err.getMessage()}")
}
finally {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
@@ -180,7 +179,7 @@ def generateContainerStage(platform) {
dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh 'make'
- sh "${platform} == \"focal\" && false"
+ sh "\"${platform}\" == \"focal\" && false"
sh 'make eunit'
sh 'make elixir-suite'
sh 'make exunit'
@@ -188,13 +187,12 @@ def generateContainerStage(platform) {
}
}
catch (err) {
- currentBuild.result = 'FAILURE'
sh 'ls -l ${WORKSPACE}'
dir( "${platform}/build" ) {
sh 'ls -l'
sh 'make build-report'
}
- error("{$err}")
+ error("Build step failed with error: ${err.getMessage()}")
}
finally {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
@@ -208,7 +206,7 @@ def generateContainerStage(platform) {
sh( script: "mkdir -p ${platform}/couchdb", label: 'Create build directory' )
sh( script: "tar -xf apache-couchdb-*.tar.gz -C ${platform}/couchdb", label: 'Unpack release' )
sh( script: "cd ${platform} && git clone https://github.com/apache/couchdb-pkg", label: 'Clone packaging helper repo' )
- sh "${platform} == \"centos7\" && false"
+ sh "\"${platform}\" == \"centos7\" && false"
dir( "${platform}/couchdb-pkg" ) {
sh( script: 'make', label: 'Build packages' )
}
@@ -221,9 +219,8 @@ def generateContainerStage(platform) {
archiveArtifacts artifacts: 'pkgs/**', fingerprint: true, onlyIfSuccessful: true
}
catch (err) {
- currentBuild.result = 'FAILURE'
sh 'ls -l ${WORKSPACE}'
- error("{$err}")
+ error("Build step failed with error: ${err.getMessage()}")
}
finally {
sh 'rm -rf ${WORKSPACE}/*'
@@ -282,6 +279,7 @@ pipeline {
spidermonkey = '78'
}
options {
+ // TODO start this timeout _after_ the agent has been acquired if possible
timeout(time: 15, unit: "MINUTES")
}
steps {