You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2022/07/02 22:27:33 UTC

[couchdb] 01/01: Add Erlang 25 to PR CI pipeline and Ubuntu Jammy to full CI

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

vatamane pushed a commit to branch jenkins-erlang-25-and-jammy-ci
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 2fc9513207eca021849b398530410548d350cdf9
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Sat Jul 2 18:25:45 2022 -0400

    Add Erlang 25 to PR CI pipeline and Ubuntu Jammy to full CI
---
 build-aux/Jenkinsfile.full | 10 ++++++++--
 build-aux/Jenkinsfile.pr   | 12 ++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 9de04b475..11dde0c2e 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -14,11 +14,11 @@
 // the License.
 
 // Erlang version embedded in binary packages
-ERLANG_VERSION = '23'
+ERLANG_VERSION = '23.3.4.15'
 
 // Erlang version used for rebar in release process. CouchDB will not build from
 // the release tarball on Erlang versions older than this
-MINIMUM_ERLANG_VERSION = '23'
+MINIMUM_ERLANG_VERSION = '23.3.4.15'
 
 // We create parallel build / test / package stages for each OS using the metadata
 // in this map. Adding a new OS should ideally only involve adding a new entry here.
@@ -47,6 +47,12 @@ meta = [
     image: "apache/couchdbci-ubuntu:focal-erlang-${ERLANG_VERSION}"
   ],
 
+  'jammy': [
+    name: 'Ubuntu 22.04',
+    spidermonkey_vsn: '91',
+    image: "apache/couchdbci-ubuntu:jammy-erlang-default"
+  ],
+
   'buster': [
     name: 'Debian 10',
     spidermonkey_vsn: '60',
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 7f7c6c18e..d21cbc490 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -49,11 +49,7 @@ pipeline {
     // Search for ERLANG_VERSION
     // see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
     // be done parametrically
-    LOW_ERLANG_VER = '23'
-
-    // erlfmt doesn't run with the lowest erlang version so we run it in a
-    // separate stage with a higher erlang version.
-    ERLFMT_ERLANG_VER = '23'
+    LOW_ERLANG_VER = '23.3.4.15'
   }
 
   options {
@@ -70,7 +66,7 @@ pipeline {
     stage('erlfmt') {
       agent {
         docker {
-          image "${DOCKER_IMAGE_BASE}-${ERLFMT_ERLANG_VER}"
+          image "${DOCKER_IMAGE_BASE}-${LOW_ERLANG_VER}"
           label 'docker'
           args "${DOCKER_ARGS}"
           registryUrl 'https://docker.io/'
@@ -140,7 +136,7 @@ pipeline {
         axes {
           axis {
             name 'ERLANG_VERSION'
-            values '23', '24'
+            values '23.3.4.15', '24.3.4.2', '25.0.2'
           }
           axis {
             name 'SM_VSN'
@@ -151,7 +147,7 @@ pipeline {
           exclude {
             axis {
               name 'ERLANG_VERSION'
-              values '23', '24'
+              values '23.3.4.15', '24.3.4.2'
             }
             axis {
               name 'SM_VSN'