couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject [couchdb] branch jenkins-junit-reports-and-jenkins-env updated: Always return to the builddir
Date Thu, 01 Aug 2019 14:10:10 GMT
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 0a2e637  Always return to the builddir
0a2e637 is described below

commit 0a2e637e014aeaba5f05c22bf1024a10c0266645
Author: Adam Kocoloski <kocolosk@apache.org>
AuthorDate: Thu Aug 1 10:09:53 2019 -0400

    Always return to the builddir
---
 Jenkinsfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d30dbf6..6bfd8f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,13 +36,17 @@ ls -l
 '''
 
 make_check = '''
+pwd
+cd ${builddir}/apache-couchdb-*
+pwd
+ls -l
 make
 make eunit apps=couch || (build-aux/logfile-uploader.py && false)
 find . -name "*.xml"
 '''
 
 make_packages = '''
-cd ${builddir}
+cd ${builddir}/apache-couchdb-*
 git clone https://github.com/apache/couchdb-pkg
 rm -rf couchdb
 mkdir couchdb
@@ -55,8 +59,8 @@ make ${platform} PLATFORM=${platform}
 cleanup_and_save = '''
 rm -rf ${WORKSPACE}/pkgs/${platform}
 mkdir -p ${WORKSPACE}/pkgs/${platform}
-mv ../rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${platform} || true
-mv ../couchdb/*.deb ${WORKSPACE}/pkgs/${platform} || true
+mv ${builddir}/apache-couchdb-*/rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${platform}
|| true
+mv ${builddir}/apache-couchdb-*/couchdb/*.deb ${WORKSPACE}/pkgs/${platform} || true
 '''
 
 build_script = '''


Mime
View raw message