Skip to content

Add Erlang 25 to PR CI pipeline and Ubuntu Jammy to full CI #4088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickva merged 1 commit into from
Jul 5, 2022
Merged

Add Erlang 25 to PR CI pipeline and Ubuntu Jammy to full CI #4088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions build-aux/Jenkinsfile.full
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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/'
Expand Down
26 changes: 5 additions & 21 deletions build-aux/Jenkinsfile.pr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand All @@ -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/'
Expand Down Expand Up @@ -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'
}
}

Expand Down