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 05:42:10 UTC
[couchdb] branch jenkins-dynamic-matrix updated: Fix tar invocation, use relative paths in package scripts
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
The following commit(s) were added to refs/heads/jenkins-dynamic-matrix by this push:
new 499bf14 Fix tar invocation, use relative paths in package scripts
499bf14 is described below
commit 499bf14bf0db0d093b098f8d9bf15bc6ccb2911d
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Tue Jan 18 00:41:57 2022 -0500
Fix tar invocation, use relative paths in package scripts
---
build-aux/Jenkinsfile.full | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index e6c26fc..a3f8319 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -14,21 +14,21 @@
// the License.
make_packages = '''
+mkdir ${PLATFORM}
cd ${PLATFORM}
git clone https://github.com/apache/couchdb-pkg
-rm -rf couchdb
mkdir couchdb
-cp ${WORKSPACE}/apache-couchdb-*.tar.gz couchdb
-tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz -C couchdb
+cp apache-couchdb-*.tar.gz couchdb
+tar -xf apache-couchdb-*.tar.gz -C couchdb
cd couchdb-pkg
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 pkgs/${PLATFORM}
+mkdir -p pkgs/${PLATFORM}
+mv ${PLATFORM}/rpmbuild/RPMS/$(arch)/*rpm pkgs/${PLATFORM} || true
+mv ${PLATFORM}/couchdb/*.deb pkgs/${PLATFORM} || true
'''
update_qemu = '''
@@ -129,7 +129,7 @@ def generateNativeStage(platform) {
'MAKE='+meta[platform].gnu_make
]) {
sh( script: "mkdir -p ${COUCHDB_IO_LOG_DIR} ${platform}/build", label: 'Create build directories' )
- sh "tar -xf --strip-components=1 apache-couchdb-*.tar.gz -C ${platform}/build"
+ sh "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1"
dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh '$MAKE'
@@ -189,7 +189,7 @@ def generateContainerStage(platform) {
sh( script: "rm -rf ${platform} apache-couchdb-*", label: 'Clean workspace' )
unstash 'tarball'
sh( script: "mkdir -p ${COUCHDB_IO_LOG_DIR} ${platform}/build", label: 'Create build directories' )
- sh "tar -xf --strip-components=1 apache-couchdb-*.tar.gz -C ${platform}/build"
+ sh "tar -xf apache-couchdb-*.tar.gz -C ${platform}/build --strip-components=1"
dir( "${platform}/build" ) {
sh "./configure --skip-deps --spidermonkey-version ${meta[platform].spidermonkey_vsn}"
sh 'make'
@@ -209,6 +209,7 @@ def generateContainerStage(platform) {
}
finally {
junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, **/src/mango/nosetests.xml, **/test/javascript/junit.xml'
+ // Do we actually want to unconditionally destroy the contents of the workspace here?
sh 'rm -rf ${WORKSPACE}/* ${COUCHDB_IO_LOG_DIR}'
}
}