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/16 02:02:38 UTC
[couchdb] branch jenkins-bump-erlang-and-debian-versions updated: More refinements and alignment across all platforms
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/jenkins-bump-erlang-and-debian-versions by this push:
new e6e97a9 More refinements and alignment across all platforms
e6e97a9 is described below
commit e6e97a93ecbfdcf15df7de67c83cec97ff99737e
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 21:02:26 2022 -0500
More refinements and alignment across all platforms
---
build-aux/Jenkinsfile.full | 88 +++++++++++++++++++++++++++++-----------------
1 file changed, 55 insertions(+), 33 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index dd86303..cec256f 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -99,7 +99,7 @@ pipeline {
}
environment {
// TODO find a way to avoid setting this explicitly
- sm_ver = '78'
+ spidermonkey = '78'
}
options {
timeout(time: 15, unit: "MINUTES")
@@ -108,7 +108,7 @@ pipeline {
sh '''
set
rm -rf apache-couchdb-*
- ./configure --spidermonkey-version ${sm_ver}
+ ./configure --spidermonkey-version ${spidermonkey}
make erlfmt-check
make dist
chmod -R a+w * .
@@ -131,12 +131,6 @@ pipeline {
// https://issues.jenkins-ci.org/browse/JENKINS-48050
stage('Test and Package') {
-
- options {
- skipDefaultCheckout()
- timeout(time: 90, unit: "MINUTES")
- }
-
matrix {
axes {
axis {
@@ -144,7 +138,7 @@ pipeline {
values 'macos', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
}
axis {
- name 'sm_ver'
+ name 'spidermonkey'
values '1.8.5', '60', '68', '78'
}
}
@@ -155,7 +149,7 @@ pipeline {
values 'centos7', 'bionic', 'stretch'
}
axis {
- name 'sm_ver'
+ name 'spidermonkey'
notValues '1.8.5'
}
}
@@ -165,7 +159,7 @@ pipeline {
values 'centos8', 'buster', 'macos'
}
axis {
- name 'sm_ver'
+ name 'spidermonkey'
notValues '60'
}
}
@@ -175,7 +169,7 @@ pipeline {
values 'focal'
}
axis {
- name 'sm_ver'
+ name 'spidermonkey'
notValues '68'
}
}
@@ -185,14 +179,14 @@ pipeline {
values 'bullseye'
}
axis {
- name 'sm_ver'
+ name 'spidermonkey'
notValues '78'
}
}
}
stages {
- stage('Non-containerized Platform') {
+ stage("Other: ${platform}") {
when {
beforeAgent true
anyOf {
@@ -205,33 +199,56 @@ pipeline {
label env.platform
}
+ options {
+ skipDefaultCheckout()
+ timeout(time: 90, unit: "MINUTES")
+ }
+
steps {
// deleteDir is OK here because we're not inside of a Docker container!
deleteDir()
unstash 'tarball'
withEnv(['HOME='+pwd()]) {
- sh '''
- PATH=/usr/local/bin:$PATH
- export PATH
- mkdir -p $COUCHDB_IO_LOG_DIR
-
- # Build CouchDB from tarball & test
- mkdir build
- cd build
- tar -xzf $WORKSPACE/apache-couchdb-*.tar.gz
- cd apache-couchdb-*
- ./configure --spidermonkey-version ${sm_ver}
- make check || (build-aux/logfile-uploader.py && false)
-
- # No package build for non-containerized platforms at this time
- '''
- } // withEnv
- } // steps
+ sh( script: unpack, label: 'Unpack tarball' )
+ dir( "${platform}/build/couchdb" ) {
+ sh 'pwd'
+ sh 'ls -l'
+ sh "./configure --spidermonkey-version ${spidermonkey}"
+ sh 'make'
+ sh 'make eunit'
+ sh 'make elixir-suite'
+ sh 'make exunit'
+ sh 'make mango-test'
+ }
+ }
+ }
+
+ // withEnv(['HOME='+pwd()]) {
+ // sh '''
+ // PATH=/usr/local/bin:$PATH
+ // export PATH
+ // mkdir -p $COUCHDB_IO_LOG_DIR
+
+ // # Build CouchDB from tarball & test
+ // mkdir build
+ // cd build
+ // tar -xzf $WORKSPACE/apache-couchdb-*.tar.gz
+ // cd apache-couchdb-*
+ // ./configure --spidermonkey-version ${sm_ver}
+ // make check || (build-aux/logfile-uploader.py && false)
+
+ // # No package build for non-containerized platforms at this time
+ // '''
+ // } // withEnv
+ // } // steps
post {
always {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
}
+ failure {
+ sh 'make build-report'
+ }
cleanup {
sh 'killall -9 beam.smp || true'
sh 'rm -rf ${WORKSPACE}/* ${COUCHDB_IO_LOG_DIR} || true'
@@ -240,7 +257,7 @@ pipeline {
} // non-containerized platform
- stage('Containerized Platform') {
+ stage("Container Build: ${platform}") {
when {
beforeAgent true
not {
@@ -261,6 +278,11 @@ pipeline {
}
}
+ options {
+ skipDefaultCheckout()
+ timeout(time: 90, unit: "MINUTES")
+ }
+
stages {
stage('Build from tarball & test') {
steps {
@@ -269,7 +291,7 @@ pipeline {
dir( "${platform}/build/couchdb" ) {
sh 'pwd'
sh 'ls -l'
- sh "./configure --spidermonkey-version ${sm_ver}"
+ sh "./configure --spidermonkey-version ${spidermonkey}"
sh 'make'
sh 'make eunit'
sh 'make elixir-suite'