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 03:37:34 UTC
[couchdb] branch jenkins-bump-erlang-and-debian-versions updated (3aa91a0 -> b6a75fb)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch jenkins-bump-erlang-and-debian-versions
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 3aa91a0 Fix the cleaner
new 21ebc36 Don't update deps when building from tarball
new 8400498 Attempt to add freebsd back to the mix
new b6a75fb Add labels to improve UX
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-aux/Jenkinsfile.full | 45 ++++++++++++++-------------------------------
1 file changed, 14 insertions(+), 31 deletions(-)
[couchdb] 02/03: Attempt to add freebsd back to the mix
Posted by ko...@apache.org.
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
commit 8400498b89f53a7938982ecbe249b345e7efe907
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 22:30:13 2022 -0500
Attempt to add freebsd back to the mix
---
build-aux/Jenkinsfile.full | 37 ++++++++++---------------------------
1 file changed, 10 insertions(+), 27 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 5920fb9..75e77af 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -59,6 +59,8 @@ platform_images = [
'bullseye': "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}"
]
+gnu_make = ['freebsd': 'gmake', 'macos': 'make']
+
pipeline {
// no top-level agent; agents must be declared for each stage
@@ -134,7 +136,7 @@ pipeline {
axes {
axis {
name 'platform'
- values 'macos', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
+ values 'freebsd', 'macos', 'centos7', 'centos8', 'bionic', 'focal', 'stretch', 'buster', 'bullseye'
}
axis {
name 'spidermonkey'
@@ -145,7 +147,7 @@ pipeline {
exclude {
axis {
name 'platform'
- values 'centos7', 'bionic', 'stretch'
+ values 'centos7', 'bionic', 'stretch', 'freebsd'
}
axis {
name 'spidermonkey'
@@ -207,40 +209,21 @@ pipeline {
// deleteDir is OK here because we're not inside of a Docker container!
deleteDir()
unstash 'tarball'
- withEnv(['HOME='+pwd(), 'PATH+USRLOCAL=/usr/local/bin']) {
+ withEnv(['HOME='+pwd(), 'PATH+USRLOCAL=/usr/local/bin', 'MAKE='+gnu_make[env.platform]]) {
sh( script: unpack, label: 'Unpack tarball' )
dir( "${platform}/build/couchdb" ) {
sh 'pwd'
sh 'ls -l'
sh "./configure --skip-deps --spidermonkey-version ${spidermonkey}"
- sh 'make'
- sh 'make eunit'
- sh 'make elixir-suite'
- sh 'make exunit'
- sh 'make mango-test'
+ 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'
[couchdb] 01/03: Don't update deps when building from tarball
Posted by ko...@apache.org.
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
commit 21ebc36fb8cf108607bd4c12fa7fc9ed7b4bde87
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 22:20:46 2022 -0500
Don't update deps when building from tarball
---
build-aux/Jenkinsfile.full | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index fc8334b..5920fb9 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -212,7 +212,7 @@ pipeline {
dir( "${platform}/build/couchdb" ) {
sh 'pwd'
sh 'ls -l'
- sh "./configure --spidermonkey-version ${spidermonkey}"
+ sh "./configure --skip-deps --spidermonkey-version ${spidermonkey}"
sh 'make'
sh 'make eunit'
sh 'make elixir-suite'
@@ -291,7 +291,7 @@ pipeline {
dir( "${platform}/build/couchdb" ) {
sh 'pwd'
sh 'ls -l'
- sh "./configure --spidermonkey-version ${spidermonkey}"
+ sh "./configure --skip-deps --spidermonkey-version ${spidermonkey}"
sh 'make'
sh 'make eunit'
sh 'make elixir-suite'
[couchdb] 03/03: Add labels to improve UX
Posted by ko...@apache.org.
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
commit b6a75fb07f36ec67547ee7b9fc76e4a8ccc34fe0
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Sat Jan 15 22:37:21 2022 -0500
Add labels to improve UX
---
build-aux/Jenkinsfile.full | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 75e77af..3e705e3 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -295,8 +295,8 @@ pipeline {
stage('Build CouchDB packages') {
steps {
unstash 'tarball'
- sh( script: make_packages )
- sh( script: cleanup_and_save )
+ sh( script: make_packages, label: 'Build packages' )
+ sh( script: cleanup_and_save, label: 'Stage package artifacts for archival' )
}
post {
success {