You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2021/04/13 21:00:49 UTC
[couchdb] branch new-pr-jenkinsfile updated (519ad01 -> e4aae12)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch new-pr-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard 519ad01 [CI] Move to new containers, expand Erlang matrix
new e4aae12 [CI] Move to new containers, expand Erlang matrix
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (519ad01)
\
N -- N -- N refs/heads/new-pr-jenkinsfile (e4aae12)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.pr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[couchdb] 01/01: [CI] Move to new containers, expand Erlang matrix
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch new-pr-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit e4aae128ef8fcfc5b1d53b8aa05d9bbee471c634
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Apr 13 16:51:01 2021 -0400
[CI] Move to new containers, expand Erlang matrix
We now host our CI containers directly under the Apache Docker Hub
org.
In addition, the newly rebuilt buster-erlang-all image has 4 Erlang
releases in it, corresponding to the latest version available in each
supported major release today:
* 20.3.8.26 (against which our 3.2 binaries will be built)
* 21.3.8.22
* 22.3.4.17
* 23.3.1
This PR changes our PR builds to run against all 4 of these versions.
---
build-aux/Jenkinsfile.pr | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..46cda1d 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -20,7 +20,7 @@ mkdir build
cd build
tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
cd apache-couchdb-*
-. /usr/local/kerl/${KERL_VER}/activate
+. /usr/local/kerl/${ERLANG_VERSION}/activate
./configure --spidermonkey-version 60
make check || (make build-report && false)
'''
@@ -39,18 +39,18 @@ pipeline {
GIT_COMMITTER_NAME = 'Jenkins User'
GIT_COMMITTER_EMAIL = 'couchdb@apache.org'
// Parameters for the matrix build
- DOCKER_IMAGE = 'couchdbdev/debian-buster-erlang-all:latest'
+ DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all'
// https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64
// We need the jenkins user mapped inside of the image
// npm config cache below deals with /home/jenkins not mapping correctly
// inside the image
DOCKER_ARGS = '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group'
- // *** BE SURE TO CHANGE THE ERLANG VERSION FARTHER DOWN S WELL ***
+
+ // *** BE SURE TO ALSO CHANGE THE ERLANG VERSIONS FARTHER DOWN ***
// Search for ERLANG_VERSION
- // see https://issues.jenkins-ci.org/browse/JENKINS-40986
- LOW_ERLANG_VER = '20.3.8.11'
- MID_ERLANG_VER = '20.3.8.25'
- HIGH_ERLANG_VER = '22.2.3'
+ // see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
+ // be done parametrically
+ LOW_ERLANG_VER = '20.3.8.26'
}
options {
@@ -105,7 +105,7 @@ pipeline {
axes {
axis {
name 'ERLANG_VERSION'
- values "20.3.8.11", "20.3.8.25", "22.2.3"
+ values '20.3.8.26', '21.3.8.22', '22.3.4.17', '23.3.1'
}
}
@@ -118,9 +118,6 @@ pipeline {
args "${DOCKER_ARGS}"
}
}
- environment {
- KERL_VER = "${ERLANG_VERSION}"
- }
options {
skipDefaultCheckout()
timeout(time: 90, unit: "MINUTES")