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 2021/04/19 15:56:53 UTC
[couchdb] branch jenkins-main-new-containers created (now 6bb463a)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch jenkins-main-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at 6bb463a [CI] Move to new containers for full build (#3505)
This branch includes the following new commits:
new d3c8475 [CI] Move to new containers, expand Erlang matrix (#3504)
new 6bb463a [CI] Move to new containers for full build (#3505)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 01/02: [CI] Move to new containers,
expand Erlang matrix (#3504)
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch jenkins-main-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d3c847526ba510918034e57f05fb5f8f4372ec71
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Apr 13 21:59:27 2021 +0000
[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.
---
build-aux/Jenkinsfile.pr | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 16b8c47..8f9d6f1 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 {
@@ -107,7 +107,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'
}
}
@@ -120,9 +120,6 @@ pipeline {
args "${DOCKER_ARGS}"
}
}
- environment {
- KERL_VER = "${ERLANG_VERSION}"
- }
options {
skipDefaultCheckout()
timeout(time: 90, unit: "MINUTES")
[couchdb] 02/02: [CI] Move to new containers for full build (#3505)
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch jenkins-main-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 6bb463a550862ca0668b366ecdc795cabc8d2569
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Wed Apr 14 05:16:12 2021 +0000
[CI] Move to new containers for full build (#3505)
---
build-aux/Jenkinsfile.full | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index ecdf476..7fd6e5c 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -81,7 +81,7 @@ pipeline {
agent {
docker {
label 'docker'
- image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
registryCredentialsId 'dockerhub_creds'
@@ -199,7 +199,7 @@ pipeline {
stage('CentOS 7') {
agent {
docker {
- image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -245,7 +245,7 @@ pipeline {
stage('CentOS 8') {
agent {
docker {
- image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -291,7 +291,7 @@ pipeline {
stage('Ubuntu Xenial') {
agent {
docker {
- image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -336,7 +336,7 @@ pipeline {
stage('Ubuntu Bionic') {
agent {
docker {
- image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -381,7 +381,7 @@ pipeline {
stage('Ubuntu Focal') {
agent {
docker {
- image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -426,7 +426,7 @@ pipeline {
stage('Debian Stretch') {
agent {
docker {
- image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -471,7 +471,7 @@ pipeline {
stage('Debian Buster amd64') {
agent {
docker {
- image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -517,7 +517,7 @@ pipeline {
when { expression { return false } }
agent {
docker {
- image 'couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1'
label 'arm64v8'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -566,7 +566,7 @@ pipeline {
// stage('Debian Buster ppc64le') {
// agent {
// docker {
-// image 'couchdbdev/ppc64le-debian-buster-erlang-20.3.8.25-1:latest'
+// image 'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
// label 'ppc64le'
// args "${DOCKER_ARGS}"
// registryUrl 'https://docker.io/'
@@ -636,12 +636,12 @@ pipeline {
}
stage('Pull latest docker image') {
steps {
- sh "docker pull couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest"
+ sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1"
}
}
stage('Build from tarball & test & packages') {
steps {
- withDockerContainer(image: "couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest", args: "${DOCKER_ARGS}") {
+ withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1", args: "${DOCKER_ARGS}") {
unstash 'tarball'
withEnv(['MIX_HOME='+pwd(), 'HEX_HOME='+pwd()]) {
sh( script: build_and_test )
@@ -681,7 +681,7 @@ pipeline {
agent {
docker {
- image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+ image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
label 'docker'
args "${DOCKER_ARGS}"
registryUrl 'https://docker.io/'
@@ -725,8 +725,7 @@ pipeline {
sh '''
cp js/centos-7/*rpm pkgs/centos7
cp js/centos-8/*rpm pkgs/centos8
- cd pkgs
- cd centos7 && createrepo --database .
+ cd pkgs/centos7 && createrepo --database .
cd ../centos8 && createrepo --database .
'''