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 2017/07/30 06:15:28 UTC

[couchdb] branch master updated (abeec24 -> 7f17678)

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

wohali pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit abeec24  Bump image version in Jenkinsfile
     new 7f17678  Bump image version in Jenkinsfile

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (abeec24)
            \
             N -- N -- N   refs/heads/master (7f17678)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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.


Summary of changes:
 Jenkinsfile | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: Bump image version in Jenkinsfile

Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7f176787cfa4dd4c1824504589ea126db8218c37
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Sun Jul 30 00:24:58 2017 -0400

    Bump image version in Jenkinsfile
---
 Jenkinsfile | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a202747..c2740f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,27 +29,30 @@ pipeline {
   stages {
     stage('Build') {
       agent {
-        docker {
+        // Cannot use docker agent type because image will not be pulled fresh
+        // each time. Instead, manually insert docker pull then run with the
+        // the docker image.
+        node {
           label 'couchdbtest'
-          // This image has the oldest Erlang we support, 16B03
-          image 'couchdbdev/ubuntu-14.04-erlang-default'
-          // 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 is required because /home/jenkins doesn't
-          // ACTUALLY exist in the image
-          // We need root here to clean up after previous runs where we used to do everything as root
-          args '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group'
         }
       }
       steps {
+        // This image has the oldest Erlang we support, 16B03
+        sh 'docker pull couchdbdev/ubuntu-14.04-erlang-default:latest'
         timeout(time: 15, unit: "MINUTES") {
-          sh '''
-            set
-            rm -rf apache-couchdb-*
-            ./configure --with-curl
-            make dist
-            chmod -R a+w * .
-          '''
+          // 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 is required because /home/jenkins doesn't
+          // ACTUALLY exist in the image
+          withDockerContainer(image: 'couchdbdev/ubuntu-14.04-erlang-default', args: '-e npm_config_cache=npm-cache -e HOME=. -v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group') {
+            sh '''
+              set
+              rm -rf apache-couchdb-*
+              ./configure --with-curl
+              make dist
+              chmod -R a+w * .
+            '''
+          }
         }
       }
       post {

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.