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/05 07:19:26 UTC
[couchdb] branch main updated: 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 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 eb2f8d998 Add Erlang 25 to PR CI pipeline and Ubuntu Jammy to full CI
eb2f8d998 is described below
commit eb2f8d998779246b3847d2ba4341837926ec9f4b
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 | 14 ++++++++++----
build-aux/Jenkinsfile.pr | 26 +++++---------------------
2 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 9de04b475..bc5358e49 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',
@@ -261,7 +267,7 @@ pipeline {
agent {
docker {
label 'docker'
- image "apache/couchdbci-debian:erlang-${MINIMUM_ERLANG_VERSION}"
+ image "apache/couchdbci-debian:bullseye-erlang-${MINIMUM_ERLANG_VERSION}"
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
registryCredentialsId 'dockerhub_creds'
@@ -378,7 +384,7 @@ pipeline {
agent {
docker {
- image "apache/couchdbci-debian:erlang-${ERLANG_VERSION}"
+ image "apache/couchdbci-debian:bullseye-erlang-${ERLANG_VERSION}"
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 7f7c6c18e..2ca33ac04 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -38,7 +38,7 @@ pipeline {
GIT_COMMITTER_NAME = 'Jenkins User'
GIT_COMMITTER_EMAIL = 'couchdb@apache.org'
// Parameters for the matrix build
- DOCKER_IMAGE_BASE = 'apache/couchdbci-debian:erlang'
+ DOCKER_IMAGE_BASE = 'apache/couchdbci-debian:bullseye-erlang'
// 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
@@ -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,23 +136,11 @@ 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'
- values '60', '78'
- }
- }
- excludes {
- exclude {
- axis {
- name 'ERLANG_VERSION'
- values '23', '24'
- }
- axis {
- name 'SM_VSN'
- notValues '78'
- }
+ values '78'
}
}