You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/01/07 17:35:43 UTC
[couchdb] branch jenkins-docker-label created (now a0de7d3)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch jenkins-docker-label
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at a0de7d3 Jenkins: Use 'docker' label for dockerised builds
This branch includes the following new commits:
new a0de7d3 Jenkins: Use 'docker' label for dockerised builds
The 1 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/01: Jenkins: Use 'docker' label for dockerised builds
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch jenkins-docker-label
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a0de7d3c41bc0cf1666a852c527e9780f9d5d4fd
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Jan 7 12:35:32 2020 -0500
Jenkins: Use 'docker' label for dockerised builds
---
build-aux/Jenkinsfile.full | 11 ++++++++++-
build-aux/Jenkinsfile.pr | 2 ++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 7087bba..9e1f5c6 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -80,6 +80,7 @@ pipeline {
stage('Build Release Tarball') {
agent {
docker {
+ label 'docker'
image 'couchdbdev/debian-stretch-erlang-20.3.8.24-1:latest'
args "${DOCKER_ARGS}"
alwaysPull true
@@ -124,7 +125,7 @@ pipeline {
stage('FreeBSD') {
agent {
- label 'couchdb && freebsd'
+ label 'freebsd'
}
steps {
// deleteDir is OK here because we're not inside of a Docker container!
@@ -160,6 +161,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/centos-6-erlang-20.3.8.24-1:latest'
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}
@@ -203,6 +205,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/centos-7-erlang-20.3.8.24-1:latest'
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}
@@ -247,6 +250,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/centos-8-erlang-20.3.8.24-1:latest'
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}
@@ -291,6 +295,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.24-1:latest'
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}
@@ -334,6 +339,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.24-1:latest'
+ label 'docker'
alwaysPull true
args "${DOCKER_ARGS}"
}
@@ -377,6 +383,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/debian-stretch-erlang-20.3.8.24-1:latest'
+ label 'docker'
alwaysPull true
args "${DOCKER_ARGS}"
}
@@ -420,6 +427,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/debian-buster-erlang-20.3.8.24-1:latest'
+ label 'docker'
alwaysPull true
args "${DOCKER_ARGS}"
}
@@ -543,6 +551,7 @@ pipeline {
agent {
docker {
image 'couchdbdev/debian-buster-erlang-20.3.8.24-1:latest'
+ label 'docker'
alwaysPull true
args "${DOCKER_ARGS}"
}
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index c7cb68f..c45c04a 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -67,6 +67,7 @@ pipeline {
agent {
docker {
image "${DOCKER_IMAGE}"
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}
@@ -114,6 +115,7 @@ pipeline {
agent {
docker {
image "${DOCKER_IMAGE}"
+ label 'docker'
args "${DOCKER_ARGS}"
alwaysPull true
}