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 2022/01/18 04:41:35 UTC

[couchdb] 01/02: Fix platform -> PLATFORM env var

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

kocolosk pushed a commit to branch jenkins-dynamic-matrix
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e487dcddf2cf611ee83bf8e83e1e621e28d3fa93
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 17 23:41:08 2022 -0500

    Fix platform -> PLATFORM env var
---
 build-aux/Jenkinsfile.full | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index d92921e..f22dadd 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -14,19 +14,15 @@
 // the License.
 
 unpack = '''
-pwd
-ls -l
-mkdir -p ${COUCHDB_IO_LOG_DIR} ${PLATFORM}
+rm -rf ${PLATFORM}/build
+mkdir -p ${COUCHDB_IO_LOG_DIR} ${PLATFORM}/build
 cd ${PLATFORM}
-ls -l
-rm -rf build
-mkdir build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz -C build
 mv build/apache-couchdb-* build/couchdb
 '''
 
 make_packages = '''
-cd ${platform}
+cd ${PLATFORM}
 git clone https://github.com/apache/couchdb-pkg
 rm -rf couchdb
 mkdir couchdb
@@ -37,10 +33,10 @@ make
 '''
 
 cleanup_and_save = '''
-rm -rf ${WORKSPACE}/pkgs/${platform}
-mkdir -p ${WORKSPACE}/pkgs/${platform}
-mv ${WORKSPACE}/${platform}/rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${platform} || true
-mv ${WORKSPACE}/${platform}/couchdb/*.deb ${WORKSPACE}/pkgs/${platform} || true
+rm -rf ${WORKSPACE}/pkgs/${PLATFORM}
+mkdir -p ${WORKSPACE}/pkgs/${PLATFORM}
+mv ${WORKSPACE}/${PLATFORM}/rpmbuild/RPMS/$(arch)/*rpm ${WORKSPACE}/pkgs/${PLATFORM} || true
+mv ${WORKSPACE}/${PLATFORM}/couchdb/*.deb ${WORKSPACE}/pkgs/${PLATFORM} || true
 '''
 
 update_qemu = '''