[couchdb] 01/02: Fix paths on FreeBSD, reorder mv commands

[ko...@apache.org]

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

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

commit 7bae5b6c59429ba6ffbc553616879277aebe016b
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Wed Jul 31 14:09:18 2019 -0400

    Fix paths on FreeBSD, reorder mv commands
    
    The EUnit tests run first, so if the build aborts we should try to
    upload them before the ExUnit integration tests.
---
 Jenkinsfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1b751d3..8b1ab36 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -43,8 +43,8 @@ mkdir -p ${WORKSPACE}/pkgs/${platform}
 mv ../rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${platform} || true
 mv ../couchdb/*.deb ${WORKSPACE}/pkgs/${platform} || true
 mkdir -p ${WORKSPACE}/test-results/${platform}-${arch}
-mv ../couchdb/_build/*/lib/couchdbtest/*.xml ${WORKSPACE}/test-results/${platform}-${arch}/
 mv ../couchdb/src/*/.eunit/*.xml ${WORKSPACE}/test-results/${platform}-${arch}/
+mv ../couchdb/_build/*/lib/couchdbtest/*.xml ${WORKSPACE}/test-results/${platform}-${arch}/
 rm -rf ${builddir} ${COUCHDB_IO_LOG_DIR}
 '''
 
@@ -149,7 +149,8 @@ pipeline {
                 gmake check || (build-aux/logfile-uploader.py && false)
 
                 mkdir -p ${WORKSPACE}/test-results/freebsd
-                mv ../couchdb/_build/*/lib/couchdbtest/*.xml ${WORKSPACE}/test-results/freebsd/
+                mv src/*/.eunit/*.xml ${WORKSPACE}/test-results/${platform}-${arch}/
+                mv _build/*/lib/couchdbtest/*.xml ${WORKSPACE}/test-results/freebsd/
                 # No package build for FreeBSD at this time
                 rm -rf $builddir $COUCHDB_IO_LOG_DIR
               '''