You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2019/08/01 11:32:36 UTC

[couchdb] branch jenkins-junit-reports-and-jenkins-env updated: Use environment directly instead of withEnv

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

kocolosk pushed a commit to branch jenkins-junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/jenkins-junit-reports-and-jenkins-env by this push:
     new 203fa63  Use environment directly instead of withEnv
203fa63 is described below

commit 203fa63c483e93674f1dbd42caf624217b8a3aab
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Thu Aug 1 07:32:18 2019 -0400

    Use environment directly instead of withEnv
---
 Jenkinsfile | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d6edf84..c164c60 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -183,26 +183,25 @@ pipeline {
           }
           environment {
             platform = 'centos6'
+            builddir = pwd tmp:true
           }
-          withEnv(['BUILDDIR='+pwd(tmp: true)]) {
-            steps {
-              sh 'rm -f apache-couchdb-*.tar.gz'
-              unstash 'tarball'
-              sh( script: build_script )
-            } // steps
-            post {
-              always {
-                junit '${BUILDDIR}/build/apache-couchdb-*/src/*/.eunit/*.xml'
-                junit '${BUILDDIR}/build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
-              }
-              success {
-                archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-              }
-              cleanup {
-                sh 'rm -rf ${BUILDDIR} ${COUCHDB_IO_LOG_DIR}'
-              }
-            } // post
-          } // withEnv
+          steps {
+            sh 'rm -f apache-couchdb-*.tar.gz'
+            unstash 'tarball'
+            sh( script: build_script )
+          } // steps
+          post {
+            always {
+              junit '${BUILDDIR}/build/apache-couchdb-*/src/*/.eunit/*.xml'
+              junit '${BUILDDIR}/build/apache-couchdb-*/_build/*/lib/couchdbtest/*.xml'
+            }
+            success {
+              archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
+            }
+            cleanup {
+              sh 'rm -rf ${BUILDDIR} ${COUCHDB_IO_LOG_DIR}'
+            }
+          } // post
         } // stage
 
         // stage('CentOS 7') {