diff options
author | Joan Touzet <wohali@users.noreply.github.com> | 2021-04-13 21:59:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-13 17:59:27 -0400 |
commit | a27f2416765c9ba238cd18db82686a4e066aa876 (patch) | |
tree | e8bb223f3f4293e6d685a3ede5a089eecbc89720 | |
parent | ed21b643e4ec9f1ed02022855696fd2d5f4cbe0e (diff) | |
download | couchdb-a27f2416765c9ba238cd18db82686a4e066aa876.tar.gz |
[CI] Move to new containers, expand Erlang matrix (#3504)
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.
-rw-r--r-- | build-aux/Jenkinsfile.pr | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr index 718dba10d..46cda1d70 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") |