[couchdb] branch main updated: Update Jenkins Erlang versions, add 24 (#3892)

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new e847d5f  Update Jenkins Erlang versions, add 24 (#3892)
e847d5f is described below

commit e847d5fe2c84f84301e961c968f105700f6735bc
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Jan 12 19:18:46 2022 -0500

    Update Jenkins Erlang versions, add 24 (#3892)
---
 build-aux/Jenkinsfile.pr | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index b230a1b..e3f2961 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -21,7 +21,7 @@ cd build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
 cd apache-couchdb-*
 . /usr/local/kerl/${ERLANG_VERSION}/activate
-./configure --spidermonkey-version 60
+./configure
 make check || (make build-report && false)
 '''
 
@@ -39,7 +39,7 @@ pipeline {
     GIT_COMMITTER_NAME = 'Jenkins User'
     GIT_COMMITTER_EMAIL = 'couchdb@apache.org'
     // Parameters for the matrix build
-    DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all'
+    DOCKER_IMAGE = 'apache/couchdbci-debian:bullseye-erlang-all-1'
     // 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
@@ -50,7 +50,10 @@ pipeline {
     // Search for ERLANG_VERSION
     // see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
     // be done parametrically
-    LOW_ERLANG_VER = '21.3.8.22'
+    LOW_ERLANG_VER = '21.3.8.24'
+
+    // Ensure that the SpiderMonkey version is appropriate for the $DOCKER_IMAGE
+    SM_VSN = '78'
   }
 
   options {
@@ -108,8 +111,7 @@ pipeline {
         axes {
           axis {
             name 'ERLANG_VERSION'
-            // kerl can't build 24 yet
-            values '21.3.8.22', '22.3.4.17', '23.3.1'
+            values '21.3.8.24', '22.3.4.24', '23.3.4.10', '24.2'
           }
         }